Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
shell: bash
-
name: Read image version
uses: bfren/read-file@v1
uses: bfren/read-file@v2
with:
file: ./VERSION
id: version
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ jobs:
shell: bash
-
name: Read image version
uses: bfren/read-file@v1
uses: bfren/read-file@v2
with:
file: ./VERSION_MAJOR
id: version_major
-
name: Read image version
uses: bfren/read-file@v1
uses: bfren/read-file@v2
with:
file: ./VERSION_MINOR
id: version_minor
-
name: Read version
uses: bfren/read-file@v1
uses: bfren/read-file@v2
with:
file: ./VERSION
id: version
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bfren/nginx:nginx1.22-4.0.15
FROM bfren/nginx:nginx1.22-4.0.16

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-proxy"

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.1.1
5.1.2
15 changes: 11 additions & 4 deletions ssl-conf-sample.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
{
"$schema": "https://raw.githubusercontent.com/bfren/docker-nginx-proxy/main/ssl-conf-schema.json",
"$schema": "https://schemas.bfren.dev/docker/nginx-proxy/domains.json",
"domains": [
{
"primary": "example.com",
"upstream": "http://example:5000",
"aliases": [ "www.example.com", "ex.com", "www.ex.com" ],
"aliases": [
"www.example.com",
"ex.com",
"www.ex.com"
],
"custom": true
},
{
"primary": "test.com",
"upstream": "http://test",
"aliases": [ "www.test.com", "fred.co.uk" ]
"aliases": [
"www.test.com",
"fred.co.uk"
]
}
]
}
}
40 changes: 0 additions & 40 deletions ssl-conf-schema.json

This file was deleted.