mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-08-07 07:28:44 +09:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 LinuxServer-CI
|
a9d1f7f0ee | ||
|
LinuxServer-CI
|
d3fe405b46 | ||
|
LinuxServer-CI
|
32c26223dd | ||
 aptalca
|
60161a3baf | ||
|
aptalca
|
321837be0d |
@@ -433,6 +433,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **01.06.26:** - Remove obsolete old cert check logic.
|
||||||
* **23.01.26:** - Reorder init to fix proxy conf version checks.
|
* **23.01.26:** - Reorder init to fix proxy conf version checks.
|
||||||
* **21.12.25:** - Add support for hetzner-cloud dns validation.
|
* **21.12.25:** - Add support for hetzner-cloud dns validation.
|
||||||
* **04.11.25:** - Switch default Gandi credentials from API Key to Token, allow DNS propagation time for Azure DNS plugin.
|
* **04.11.25:** - Switch default Gandi credentials from API Key to Token, allow DNS propagation time for Azure DNS plugin.
|
||||||
|
|||||||
+37
-37
@@ -22,9 +22,9 @@ azure-mgmt-core 1.6.0 python
|
|||||||
azure-mgmt-dns 9.0.0 python
|
azure-mgmt-dns 9.0.0 python
|
||||||
backports-tarfile 1.2.0 python
|
backports-tarfile 1.2.0 python
|
||||||
bash 5.2.37-r0 apk
|
bash 5.2.37-r0 apk
|
||||||
beautifulsoup4 4.14.3 python
|
beautifulsoup4 4.15.0 python
|
||||||
boto3 1.43.18 python
|
boto3 1.43.29 python
|
||||||
botocore 1.43.18 python
|
botocore 1.43.29 python
|
||||||
brotli-libs 1.1.0-r2 apk
|
brotli-libs 1.1.0-r2 apk
|
||||||
bs4 0.0.2 python
|
bs4 0.0.2 python
|
||||||
busybox 1.37.0-r20 apk
|
busybox 1.37.0-r20 apk
|
||||||
@@ -86,15 +86,15 @@ cli UNKNOWN binary
|
|||||||
cli-32 UNKNOWN binary
|
cli-32 UNKNOWN binary
|
||||||
cli-64 UNKNOWN binary
|
cli-64 UNKNOWN binary
|
||||||
cli-arm64 UNKNOWN binary
|
cli-arm64 UNKNOWN binary
|
||||||
cloudflare 5.2.0 python
|
cloudflare 5.3.0 python
|
||||||
composer 2.10.0 binary
|
composer 2.10.1 binary
|
||||||
configargparse 1.7.5 python
|
configargparse 1.7.5 python
|
||||||
configobj 5.0.9 python
|
configobj 5.0.9 python
|
||||||
coreutils 9.7-r1 apk
|
coreutils 9.7-r1 apk
|
||||||
coreutils-env 9.7-r1 apk
|
coreutils-env 9.7-r1 apk
|
||||||
coreutils-fmt 9.7-r1 apk
|
coreutils-fmt 9.7-r1 apk
|
||||||
coreutils-sha512sum 9.7-r1 apk
|
coreutils-sha512sum 9.7-r1 apk
|
||||||
cryptography 48.0.0 python
|
cryptography 49.0.0 python
|
||||||
curl 8.14.1-r2 apk
|
curl 8.14.1-r2 apk
|
||||||
distro 1.9.0 python
|
distro 1.9.0 python
|
||||||
dns-lexicon 3.25.2 python
|
dns-lexicon 3.25.2 python
|
||||||
@@ -104,7 +104,7 @@ domeneshop 0.4.4 python
|
|||||||
fail2ban 1.1.0 python
|
fail2ban 1.1.0 python
|
||||||
fail2ban 1.1.0-r3 apk
|
fail2ban 1.1.0-r3 apk
|
||||||
fail2ban-pyc 1.1.0-r3 apk
|
fail2ban-pyc 1.1.0-r3 apk
|
||||||
filelock 3.29.0 python
|
filelock 3.29.3 python
|
||||||
findutils 4.10.0-r0 apk
|
findutils 4.10.0-r0 apk
|
||||||
fontconfig 2.15.0-r3 apk
|
fontconfig 2.15.0-r3 apk
|
||||||
freetype 2.13.3-r0 apk
|
freetype 2.13.3-r0 apk
|
||||||
@@ -121,9 +121,9 @@ gnupg-keyboxd 2.4.9-r0 apk
|
|||||||
gnupg-utils 2.4.9-r0 apk
|
gnupg-utils 2.4.9-r0 apk
|
||||||
gnupg-wks-client 2.4.9-r0 apk
|
gnupg-wks-client 2.4.9-r0 apk
|
||||||
gnutls 3.8.13-r0 apk
|
gnutls 3.8.13-r0 apk
|
||||||
google-api-core 2.30.3 python
|
google-api-core 2.31.0 python
|
||||||
google-api-python-client 2.197.0 python
|
google-api-python-client 2.197.0 python
|
||||||
google-auth 2.53.0 python
|
google-auth 2.54.0 python
|
||||||
google-auth-httplib2 0.4.0 python
|
google-auth-httplib2 0.4.0 python
|
||||||
googleapis-common-protos 1.75.0 python
|
googleapis-common-protos 1.75.0 python
|
||||||
gpg 2.4.9-r0 apk
|
gpg 2.4.9-r0 apk
|
||||||
@@ -136,13 +136,13 @@ gui-32 UNKNOWN binary
|
|||||||
gui-64 UNKNOWN binary
|
gui-64 UNKNOWN binary
|
||||||
gui-arm64 UNKNOWN binary
|
gui-arm64 UNKNOWN binary
|
||||||
h11 0.16.0 python
|
h11 0.16.0 python
|
||||||
hcloud 2.20.0 python
|
hcloud 2.21.0 python
|
||||||
httpcore 1.0.9 python
|
httpcore 1.0.9 python
|
||||||
httplib2 0.31.2 python
|
httplib2 0.31.2 python
|
||||||
httpx 0.28.1 python
|
httpx 0.28.1 python
|
||||||
icu-data-en 76.1-r1 apk
|
icu-data-en 76.1-r1 apk
|
||||||
icu-libs 76.1-r1 apk
|
icu-libs 76.1-r1 apk
|
||||||
idna 3.17 python
|
idna 3.18 python
|
||||||
importlib-metadata 8.7.1 python
|
importlib-metadata 8.7.1 python
|
||||||
inotify-tools 4.23.9.0-r0 apk
|
inotify-tools 4.23.9.0-r0 apk
|
||||||
inotify-tools-libs 4.23.9.0-r0 apk
|
inotify-tools-libs 4.23.9.0-r0 apk
|
||||||
@@ -164,7 +164,7 @@ libattr 2.5.2-r2 apk
|
|||||||
libavif 1.3.0-r0 apk
|
libavif 1.3.0-r0 apk
|
||||||
libbsd 0.12.2-r0 apk
|
libbsd 0.12.2-r0 apk
|
||||||
libbz2 1.0.8-r6 apk
|
libbz2 1.0.8-r6 apk
|
||||||
libcrypto3 3.5.6-r0 apk
|
libcrypto3 3.5.7-r0 apk
|
||||||
libcurl 8.14.1-r2 apk
|
libcurl 8.14.1-r2 apk
|
||||||
libdav1d 1.5.1-r0 apk
|
libdav1d 1.5.1-r0 apk
|
||||||
libedit 20250104.3.1-r1 apk
|
libedit 20250104.3.1-r1 apk
|
||||||
@@ -199,7 +199,7 @@ libseccomp 2.6.0-r0 apk
|
|||||||
libsharpyuv 1.5.0-r0 apk
|
libsharpyuv 1.5.0-r0 apk
|
||||||
libsm 1.2.5-r0 apk
|
libsm 1.2.5-r0 apk
|
||||||
libsodium 1.0.20-r1 apk
|
libsodium 1.0.20-r1 apk
|
||||||
libssl3 3.5.6-r0 apk
|
libssl3 3.5.7-r0 apk
|
||||||
libstdc++ 14.2.0-r6 apk
|
libstdc++ 14.2.0-r6 apk
|
||||||
libtasn1 4.21.0-r0 apk
|
libtasn1 4.21.0-r0 apk
|
||||||
libunistring 1.3-r0 apk
|
libunistring 1.3-r0 apk
|
||||||
@@ -210,7 +210,7 @@ libxau 1.0.12-r0 apk
|
|||||||
libxcb 1.17.0-r0 apk
|
libxcb 1.17.0-r0 apk
|
||||||
libxdmcp 1.1.5-r1 apk
|
libxdmcp 1.1.5-r1 apk
|
||||||
libxext 1.3.6-r2 apk
|
libxext 1.3.6-r2 apk
|
||||||
libxml2 2.13.9-r0 apk
|
libxml2 2.13.9-r1 apk
|
||||||
libxpm 3.5.19-r0 apk
|
libxpm 3.5.19-r0 apk
|
||||||
libxslt 1.1.43-r3 apk
|
libxslt 1.1.43-r3 apk
|
||||||
libxt 1.3.1-r0 apk
|
libxt 1.3.1-r0 apk
|
||||||
@@ -236,28 +236,28 @@ ncurses-terminfo-base 6.5_p20250503-r0 apk
|
|||||||
netcat-openbsd 1.229.1-r0 apk
|
netcat-openbsd 1.229.1-r0 apk
|
||||||
nettle 3.10.2-r0 apk
|
nettle 3.10.2-r0 apk
|
||||||
nghttp2-libs 1.69.0-r0 apk
|
nghttp2-libs 1.69.0-r0 apk
|
||||||
nginx 1.28.3-r2 apk
|
nginx 1.28.3-r3 apk
|
||||||
nginx-mod-devel-kit 1.28.3-r2 apk
|
nginx-mod-devel-kit 1.28.3-r3 apk
|
||||||
nginx-mod-http-brotli 1.28.3-r2 apk
|
nginx-mod-http-brotli 1.28.3-r3 apk
|
||||||
nginx-mod-http-dav-ext 1.28.3-r2 apk
|
nginx-mod-http-dav-ext 1.28.3-r3 apk
|
||||||
nginx-mod-http-echo 1.28.3-r2 apk
|
nginx-mod-http-echo 1.28.3-r3 apk
|
||||||
nginx-mod-http-fancyindex 1.28.3-r2 apk
|
nginx-mod-http-fancyindex 1.28.3-r3 apk
|
||||||
nginx-mod-http-geoip2 1.28.3-r2 apk
|
nginx-mod-http-geoip2 1.28.3-r3 apk
|
||||||
nginx-mod-http-headers-more 1.28.3-r2 apk
|
nginx-mod-http-headers-more 1.28.3-r3 apk
|
||||||
nginx-mod-http-image-filter 1.28.3-r2 apk
|
nginx-mod-http-image-filter 1.28.3-r3 apk
|
||||||
nginx-mod-http-perl 1.28.3-r2 apk
|
nginx-mod-http-perl 1.28.3-r3 apk
|
||||||
nginx-mod-http-redis2 1.28.3-r2 apk
|
nginx-mod-http-redis2 1.28.3-r3 apk
|
||||||
nginx-mod-http-set-misc 1.28.3-r2 apk
|
nginx-mod-http-set-misc 1.28.3-r3 apk
|
||||||
nginx-mod-http-upload-progress 1.28.3-r2 apk
|
nginx-mod-http-upload-progress 1.28.3-r3 apk
|
||||||
nginx-mod-http-xslt-filter 1.28.3-r2 apk
|
nginx-mod-http-xslt-filter 1.28.3-r3 apk
|
||||||
nginx-mod-mail 1.28.3-r2 apk
|
nginx-mod-mail 1.28.3-r3 apk
|
||||||
nginx-mod-rtmp 1.28.3-r2 apk
|
nginx-mod-rtmp 1.28.3-r3 apk
|
||||||
nginx-mod-stream 1.28.3-r2 apk
|
nginx-mod-stream 1.28.3-r3 apk
|
||||||
nginx-mod-stream-geoip2 1.28.3-r2 apk
|
nginx-mod-stream-geoip2 1.28.3-r3 apk
|
||||||
nginx-vim 1.28.3-r2 apk
|
nginx-vim 1.28.3-r3 apk
|
||||||
npth 1.8-r0 apk
|
npth 1.8-r0 apk
|
||||||
oniguruma 6.9.10-r0 apk
|
oniguruma 6.9.10-r0 apk
|
||||||
openssl 3.5.6-r0 apk
|
openssl 3.5.7-r0 apk
|
||||||
p11-kit 0.25.5-r2 apk
|
p11-kit 0.25.5-r2 apk
|
||||||
packaging 26.0 python
|
packaging 26.0 python
|
||||||
packaging 26.2 python
|
packaging 26.2 python
|
||||||
@@ -315,13 +315,13 @@ php84-xmlwriter 8.4.16-r0 apk
|
|||||||
php84-xsl 8.4.16-r0 apk
|
php84-xsl 8.4.16-r0 apk
|
||||||
php84-zip 8.4.16-r0 apk
|
php84-zip 8.4.16-r0 apk
|
||||||
pinentry 1.3.1-r0 apk
|
pinentry 1.3.1-r0 apk
|
||||||
pip 26.1.1 python
|
pip 26.1.2 python
|
||||||
pkb-client 2.3.1 python
|
pkb-client 2.3.1 python
|
||||||
platformdirs 4.4.0 python
|
platformdirs 4.4.0 python
|
||||||
popt 1.19-r4 apk
|
popt 1.19-r4 apk
|
||||||
procps-ng 4.0.4-r3 apk
|
procps-ng 4.0.4-r3 apk
|
||||||
proto-plus 1.28.0 python
|
proto-plus 1.28.0 python
|
||||||
protobuf 7.35.0 python
|
protobuf 7.35.1 python
|
||||||
pyacmedns 0.4 python
|
pyacmedns 0.4 python
|
||||||
pyasn1 0.6.3 python
|
pyasn1 0.6.3 python
|
||||||
pyasn1-modules 0.4.2 python
|
pyasn1-modules 0.4.2 python
|
||||||
@@ -331,7 +331,7 @@ pydantic 2.13.4 python
|
|||||||
pydantic-core 2.46.4 python
|
pydantic-core 2.46.4 python
|
||||||
pyjwt 2.13.0 python
|
pyjwt 2.13.0 python
|
||||||
pynamecheap 0.0.3 python
|
pynamecheap 0.0.3 python
|
||||||
pyopenssl 26.2.0 python
|
pyopenssl 26.3.0 python
|
||||||
pyotp 2.9.0 python
|
pyotp 2.9.0 python
|
||||||
pyparsing 3.3.2 python
|
pyparsing 3.3.2 python
|
||||||
pyrfc3339 2.1.0 python
|
pyrfc3339 2.1.0 python
|
||||||
|
|||||||
@@ -219,6 +219,7 @@ init_diagram: |
|
|||||||
"swag:latest" <- Base Images
|
"swag:latest" <- Base Images
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- {date: "01.06.26:", desc: "Remove obsolete old cert check logic."}
|
||||||
- {date: "23.01.26:", desc: "Reorder init to fix proxy conf version checks."}
|
- {date: "23.01.26:", desc: "Reorder init to fix proxy conf version checks."}
|
||||||
- {date: "21.12.25:", desc: "Add support for hetzner-cloud dns validation."}
|
- {date: "21.12.25:", desc: "Add support for hetzner-cloud dns validation."}
|
||||||
- {date: "04.11.25:", desc: "Switch default Gandi credentials from API Key to Token, allow DNS propagation time for Azure DNS plugin."}
|
- {date: "04.11.25:", desc: "Switch default Gandi credentials from API Key to Token, allow DNS propagation time for Azure DNS plugin."}
|
||||||
|
|||||||
@@ -206,18 +206,6 @@ fi
|
|||||||
# saving new variables
|
# saving new variables
|
||||||
echo -e "ORIGURL=\"${URL}\" ORIGSUBDOMAINS=\"${SUBDOMAINS}\" ORIGONLY_SUBDOMAINS=\"${ONLY_SUBDOMAINS}\" ORIGEXTRA_DOMAINS=\"${EXTRA_DOMAINS}\" ORIGVALIDATION=\"${VALIDATION}\" ORIGDNSPLUGIN=\"${DNSPLUGIN}\" ORIGPROPAGATION=\"${PROPAGATION}\" ORIGSTAGING=\"${STAGING}\" ORIGCERTPROVIDER=\"${CERTPROVIDER}\" ORIGEMAIL=\"${EMAIL}\"" >/config/.donoteditthisfile.conf
|
echo -e "ORIGURL=\"${URL}\" ORIGSUBDOMAINS=\"${SUBDOMAINS}\" ORIGONLY_SUBDOMAINS=\"${ONLY_SUBDOMAINS}\" ORIGEXTRA_DOMAINS=\"${EXTRA_DOMAINS}\" ORIGVALIDATION=\"${VALIDATION}\" ORIGDNSPLUGIN=\"${DNSPLUGIN}\" ORIGPROPAGATION=\"${PROPAGATION}\" ORIGSTAGING=\"${STAGING}\" ORIGCERTPROVIDER=\"${CERTPROVIDER}\" ORIGEMAIL=\"${EMAIL}\"" >/config/.donoteditthisfile.conf
|
||||||
|
|
||||||
# Check if the cert is using the old LE root cert, revoke and regen if necessary
|
|
||||||
if [[ -f "/config/keys/letsencrypt/chain.pem" ]] && { [[ "${CERTPROVIDER}" == "letsencrypt" ]] || [[ "${CERTPROVIDER}" == "" ]]; } && [[ "${STAGING}" != "true" ]] && ! openssl x509 -in /config/keys/letsencrypt/chain.pem -noout -issuer | grep -q "ISRG Root X"; then
|
|
||||||
echo "The cert seems to be using the old LE root cert, which is no longer valid. Deleting and revoking."
|
|
||||||
REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
|
|
||||||
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
|
|
||||||
certbot revoke --config-dir /config/etc/letsencrypt --logs-dir /config/log/letsencrypt --work-dir /tmp/letsencrypt --config /config/etc/letsencrypt/cli.ini --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true
|
|
||||||
else
|
|
||||||
certbot revoke --config-dir /config/etc/letsencrypt --logs-dir /config/log/letsencrypt --work-dir /tmp/letsencrypt --config /config/etc/letsencrypt/cli.ini --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
|
|
||||||
fi
|
|
||||||
rm -rf /config/etc/letsencrypt/{accounts,archive,live,renewal}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# if zerossl is selected or staging is set to true, use the relevant server
|
# if zerossl is selected or staging is set to true, use the relevant server
|
||||||
if [[ "${CERTPROVIDER}" = "zerossl" ]] && [[ "${STAGING}" = "true" ]]; then
|
if [[ "${CERTPROVIDER}" = "zerossl" ]] && [[ "${STAGING}" = "true" ]]; then
|
||||||
echo "ZeroSSL does not support staging mode, ignoring STAGING variable"
|
echo "ZeroSSL does not support staging mode, ignoring STAGING variable"
|
||||||
|
|||||||
Reference in New Issue
Block a user