mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-06-20 16:26:36 +09:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Eric Nemchik
|
aa3f8bd0dd | ||
|
Eric Nemchik
|
22bafef661 | ||
|
Eric Nemchik
|
716b1237c5 |
Vendored
+4
-22
@@ -77,7 +77,6 @@ pipeline {
|
||||
script{
|
||||
env.EXIT_STATUS = ''
|
||||
env.CI_TEST_ATTEMPTED = ''
|
||||
env.PUSH_ATTEMPTED = ''
|
||||
env.LS_RELEASE = sh(
|
||||
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
|
||||
returnStdout: true).trim()
|
||||
@@ -926,9 +925,6 @@ pipeline {
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
script{
|
||||
env.PUSH_ATTEMPTED = 'true'
|
||||
}
|
||||
retry_backoff(5,5) {
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
@@ -958,18 +954,11 @@ pipeline {
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
script{
|
||||
env.PUSH_ATTEMPTED = 'true'
|
||||
}
|
||||
retry_backoff(5,5) {
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
|
||||
if [[ "${MANIFESTIMAGE%%/*}" =~ \\. ]]; then
|
||||
MANIFESTIMAGEPLUS="${MANIFESTIMAGE}"
|
||||
else
|
||||
MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
|
||||
fi
|
||||
[[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
|
||||
IFS=',' read -ra CACHE <<< "$BUILDCACHE"
|
||||
for i in "${CACHE[@]}"; do
|
||||
if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
|
||||
@@ -1137,7 +1126,7 @@ EOF
|
||||
}
|
||||
script {
|
||||
if (env.GITHUBIMAGE =~ /lspipepr/){
|
||||
if (env.CI_TEST_ATTEMPTED == "true" || env.PUSH_ATTEMPTED == "true"){
|
||||
if (env.CI_TEST_ATTEMPTED == "true"){
|
||||
sh '''#! /bin/bash
|
||||
# Function to retrieve JSON data from URL
|
||||
get_json() {
|
||||
@@ -1198,21 +1187,14 @@ EOF
|
||||
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||
-d "{\\"body\\": \\"I am a bot, here are the test results for this PR for commit ${COMMIT_SHA:0:7} : \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
|
||||
-d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
|
||||
else
|
||||
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||
-d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR for commit ${COMMIT_SHA:0:7} : \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
|
||||
-d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
|
||||
fi
|
||||
'''
|
||||
} else {
|
||||
sh '''#! /bin/bash
|
||||
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||
-d "{\\"body\\": \\"I am a bot, the build for PR commit ${COMMIT_SHA:0:7} failed and as a result no CI test was attempted and no images were pushed.\\"}"
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -433,7 +433,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **01.06.26:** - Remove obsolete old cert check logic.
|
||||
* **23.01.26:** - Reorder init to fix proxy conf version checks.
|
||||
* **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.
|
||||
|
||||
+78
-85
@@ -1,51 +1,50 @@
|
||||
NAME VERSION TYPE
|
||||
Simple Launcher 1.1.0.14 binary (+5 duplicates)
|
||||
acl-libs 2.3.2-r1 apk
|
||||
acme 5.6.0 python
|
||||
acme 5.5.0 python
|
||||
alpine-baselayout 3.7.0-r0 apk
|
||||
alpine-baselayout-data 3.7.0-r0 apk
|
||||
alpine-keys 2.5-r0 apk
|
||||
alpine-release 3.22.4-r0 apk
|
||||
annotated-types 0.7.0 python
|
||||
anyio 4.14.0 python
|
||||
alpine-release 3.22.3-r0 apk
|
||||
aom-libs 3.12.1-r0 apk
|
||||
apache2-utils 2.4.67-r0 apk
|
||||
apache2-utils 2.4.66-r0 apk
|
||||
apk-tools 2.14.9-r3 apk
|
||||
apr 1.7.5-r0 apk
|
||||
apr-util 1.6.3-r1 apk
|
||||
argon2-libs 20190702-r5 apk
|
||||
attrs 26.1.0 python
|
||||
autocommand 2.2.2 python
|
||||
azure-common 1.1.28 python
|
||||
azure-core 1.41.0 python
|
||||
azure-core 1.40.0 python
|
||||
azure-identity 1.25.3 python
|
||||
azure-mgmt-core 1.6.0 python
|
||||
azure-mgmt-dns 9.0.0 python
|
||||
backports-tarfile 1.2.0 python
|
||||
bash 5.2.37-r0 apk
|
||||
beautifulsoup4 4.15.0 python
|
||||
boto3 1.43.34 python
|
||||
botocore 1.43.34 python
|
||||
beautifulsoup4 4.14.3 python
|
||||
boto3 1.43.2 python
|
||||
botocore 1.43.2 python
|
||||
brotli-libs 1.1.0-r2 apk
|
||||
bs4 0.0.2 python
|
||||
busybox 1.37.0-r20 apk
|
||||
busybox-binsh 1.37.0-r20 apk
|
||||
c-ares 1.34.6-r0 apk
|
||||
c-client 2007f-r15 apk
|
||||
ca-certificates 20260413-r0 apk
|
||||
ca-certificates-bundle 20260413-r0 apk
|
||||
ca-certificates 20250911-r0 apk
|
||||
ca-certificates-bundle 20250911-r0 apk
|
||||
catatonit 0.2.1-r0 apk
|
||||
certbot 5.6.0 python
|
||||
certbot 5.5.0 python
|
||||
certbot-dns-acmedns 0.1.0 python
|
||||
certbot-dns-aliyun 2.0.0 python
|
||||
certbot-dns-azure 1.5.0 python
|
||||
certbot-dns-bunny 3.0.0 python
|
||||
certbot-dns-cloudflare 5.6.0 python
|
||||
certbot-dns-cloudflare 5.5.0 python
|
||||
certbot-dns-cpanel 0.4.0 python
|
||||
certbot-dns-desec 1.3.2 python
|
||||
certbot-dns-digitalocean 5.6.0 python
|
||||
certbot-dns-digitalocean 5.5.0 python
|
||||
certbot-dns-directadmin 1.0.15 python
|
||||
certbot-dns-dnsimple 5.6.0 python
|
||||
certbot-dns-dnsmadeeasy 5.6.0 python
|
||||
certbot-dns-dnsimple 5.5.0 python
|
||||
certbot-dns-dnsmadeeasy 5.5.0 python
|
||||
certbot-dns-dnspod 0.1.0 python
|
||||
certbot-dns-do 0.31.0 python
|
||||
certbot-dns-domeneshop 0.2.9 python
|
||||
@@ -53,58 +52,58 @@ certbot-dns-dreamhost 1.0 python
|
||||
certbot-dns-duckdns 1.8.0 python
|
||||
certbot-dns-dynudns 0.0.6 python
|
||||
certbot-dns-freedns 0.2.0 python
|
||||
certbot-dns-gehirn 5.6.0 python
|
||||
certbot-dns-gehirn 5.5.0 python
|
||||
certbot-dns-glesys 2.1.0 python
|
||||
certbot-dns-godaddy 2.8.0 python
|
||||
certbot-dns-google 5.6.0 python
|
||||
certbot-dns-google 5.5.0 python
|
||||
certbot-dns-he 1.0.0 python
|
||||
certbot-dns-hetzner 4.0.0 python
|
||||
certbot-dns-hetzner-cloud 1.0.5 python
|
||||
certbot-dns-infomaniak 0.2.4 python
|
||||
certbot-dns-inwx 3.0.3 python
|
||||
certbot-dns-ionos 2024.11.9 python
|
||||
certbot-dns-linode 5.6.0 python
|
||||
certbot-dns-linode 5.5.0 python
|
||||
certbot-dns-loopia 1.0.1 python
|
||||
certbot-dns-luadns 5.6.0 python
|
||||
certbot-dns-luadns 5.5.0 python
|
||||
certbot-dns-namecheap 1.0.0 python
|
||||
certbot-dns-netcup 2.0.3 python
|
||||
certbot-dns-njalla 2.0.2 python
|
||||
certbot-dns-nsone 5.6.0 python
|
||||
certbot-dns-ovh 5.6.0 python
|
||||
certbot-dns-nsone 5.5.0 python
|
||||
certbot-dns-ovh 5.5.0 python
|
||||
certbot-dns-porkbun 0.11.0 python
|
||||
certbot-dns-rfc2136 5.6.0 python
|
||||
certbot-dns-route53 5.6.0 python
|
||||
certbot-dns-sakuracloud 5.6.0 python
|
||||
certbot-dns-rfc2136 5.5.0 python
|
||||
certbot-dns-route53 5.5.0 python
|
||||
certbot-dns-sakuracloud 5.5.0 python
|
||||
certbot-dns-standalone 1.2.1 python
|
||||
certbot-dns-transip 0.5.2 python
|
||||
certbot-dns-vultr 1.1.0 python
|
||||
certbot-plugin-gandi 1.5.0 python
|
||||
certifi 2026.6.17 python
|
||||
certifi 2026.4.22 python
|
||||
cffi 2.0.0 python
|
||||
charset-normalizer 3.4.7 python
|
||||
cli UNKNOWN binary
|
||||
cli-32 UNKNOWN binary
|
||||
cli-64 UNKNOWN binary
|
||||
cli-arm64 UNKNOWN binary
|
||||
cloudflare 5.4.0 python
|
||||
composer 2.10.1 binary
|
||||
cloudflare 2.19.4 python
|
||||
composer 2.9.7 binary
|
||||
configargparse 1.7.5 python
|
||||
configobj 5.0.9 python
|
||||
coreutils 9.7-r1 apk
|
||||
coreutils-env 9.7-r1 apk
|
||||
coreutils-fmt 9.7-r1 apk
|
||||
coreutils-sha512sum 9.7-r1 apk
|
||||
cryptography 49.0.0 python
|
||||
cryptography 47.0.0 python
|
||||
curl 8.14.1-r2 apk
|
||||
distro 1.9.0 python
|
||||
dns-lexicon 3.25.2 python
|
||||
dns-lexicon 3.25.1 python
|
||||
dnslib 0.9.26 python
|
||||
dnspython 2.8.0 python
|
||||
domeneshop 0.4.4 python
|
||||
fail2ban 1.1.0 python
|
||||
fail2ban 1.1.0-r3 apk
|
||||
fail2ban-pyc 1.1.0-r3 apk
|
||||
filelock 3.29.4 python
|
||||
filelock 3.29.0 python
|
||||
findutils 4.10.0-r0 apk
|
||||
fontconfig 2.15.0-r3 apk
|
||||
freetype 2.13.3-r0 apk
|
||||
@@ -121,11 +120,11 @@ gnupg-keyboxd 2.4.9-r0 apk
|
||||
gnupg-utils 2.4.9-r0 apk
|
||||
gnupg-wks-client 2.4.9-r0 apk
|
||||
gnutls 3.8.13-r0 apk
|
||||
google-api-core 2.31.0 python
|
||||
google-api-python-client 2.197.0 python
|
||||
google-auth 2.55.0 python
|
||||
google-auth-httplib2 0.4.0 python
|
||||
googleapis-common-protos 1.75.0 python
|
||||
google-api-core 2.30.3 python
|
||||
google-api-python-client 2.195.0 python
|
||||
google-auth 2.50.0 python
|
||||
google-auth-httplib2 0.3.1 python
|
||||
googleapis-common-protos 1.74.0 python
|
||||
gpg 2.4.9-r0 apk
|
||||
gpg-agent 2.4.9-r0 apk
|
||||
gpg-wks-server 2.4.9-r0 apk
|
||||
@@ -135,14 +134,11 @@ gui UNKNOWN binary
|
||||
gui-32 UNKNOWN binary
|
||||
gui-64 UNKNOWN binary
|
||||
gui-arm64 UNKNOWN binary
|
||||
h11 0.16.0 python
|
||||
hcloud 2.22.0 python
|
||||
httpcore 1.0.9 python
|
||||
hcloud 2.19.0 python
|
||||
httplib2 0.31.2 python
|
||||
httpx 0.28.1 python
|
||||
icu-data-en 76.1-r1 apk
|
||||
icu-libs 76.1-r1 apk
|
||||
idna 3.18 python
|
||||
idna 3.13 python
|
||||
importlib-metadata 8.7.1 python
|
||||
inotify-tools 4.23.9.0-r0 apk
|
||||
inotify-tools-libs 4.23.9.0-r0 apk
|
||||
@@ -157,14 +153,15 @@ jinja2 3.1.6 python
|
||||
jmespath 1.1.0 python
|
||||
josepy 2.2.0 python
|
||||
jq 1.8.1-r0 apk
|
||||
jsonpickle 4.1.2 python
|
||||
jsonlines 4.0.0 python
|
||||
jsonpickle 4.1.1 python
|
||||
libapk2 2.14.9-r3 apk
|
||||
libassuan 2.5.7-r0 apk
|
||||
libattr 2.5.2-r2 apk
|
||||
libavif 1.3.0-r0 apk
|
||||
libbsd 0.12.2-r0 apk
|
||||
libbz2 1.0.8-r6 apk
|
||||
libcrypto3 3.5.7-r0 apk
|
||||
libcrypto3 3.5.6-r0 apk
|
||||
libcurl 8.14.1-r2 apk
|
||||
libdav1d 1.5.1-r0 apk
|
||||
libedit 20250104.3.1-r1 apk
|
||||
@@ -191,7 +188,7 @@ libncursesw 6.5_p20250503-r0 apk
|
||||
libnftnl 1.2.9-r0 apk
|
||||
libpanelw 6.5_p20250503-r0 apk
|
||||
libpng 1.6.57-r0 apk
|
||||
libpq 17.10-r0 apk
|
||||
libpq 17.9-r0 apk
|
||||
libproc2 4.0.4-r3 apk
|
||||
libpsl 0.21.5-r3 apk
|
||||
libsasl 2.1.28-r8 apk
|
||||
@@ -199,7 +196,7 @@ libseccomp 2.6.0-r0 apk
|
||||
libsharpyuv 1.5.0-r0 apk
|
||||
libsm 1.2.5-r0 apk
|
||||
libsodium 1.0.20-r1 apk
|
||||
libssl3 3.5.7-r0 apk
|
||||
libssl3 3.5.6-r0 apk
|
||||
libstdc++ 14.2.0-r6 apk
|
||||
libtasn1 4.21.0-r0 apk
|
||||
libunistring 1.3-r0 apk
|
||||
@@ -210,7 +207,7 @@ libxau 1.0.12-r0 apk
|
||||
libxcb 1.17.0-r0 apk
|
||||
libxdmcp 1.1.5-r1 apk
|
||||
libxext 1.3.6-r2 apk
|
||||
libxml2 2.13.9-r1 apk
|
||||
libxml2 2.13.9-r0 apk
|
||||
libxpm 3.5.19-r0 apk
|
||||
libxslt 1.1.43-r3 apk
|
||||
libxt 1.3.1-r0 apk
|
||||
@@ -220,14 +217,14 @@ libzip 1.11.4-r0 apk
|
||||
linux-pam 1.7.0-r4 apk
|
||||
logrotate 3.21.0-r1 apk
|
||||
loopialib 0.2.0 python
|
||||
lxml 6.1.1 python
|
||||
lxml 6.1.0 python
|
||||
lz4-libs 1.10.0-r0 apk
|
||||
markupsafe 3.0.3 python
|
||||
memcached 1.6.32-r0 apk
|
||||
mock 5.2.0 python
|
||||
more-itertools 10.8.0 python
|
||||
mpdecimal 4.0.1-r0 apk
|
||||
msal 1.37.0 python
|
||||
msal 1.36.0 python
|
||||
msal-extensions 1.3.1 python
|
||||
musl 1.2.5-r12 apk
|
||||
musl-utils 1.2.5-r12 apk
|
||||
@@ -235,29 +232,29 @@ nano 8.4-r0 apk
|
||||
ncurses-terminfo-base 6.5_p20250503-r0 apk
|
||||
netcat-openbsd 1.229.1-r0 apk
|
||||
nettle 3.10.2-r0 apk
|
||||
nghttp2-libs 1.69.0-r0 apk
|
||||
nginx 1.28.3-r3 apk
|
||||
nginx-mod-devel-kit 1.28.3-r3 apk
|
||||
nginx-mod-http-brotli 1.28.3-r3 apk
|
||||
nginx-mod-http-dav-ext 1.28.3-r3 apk
|
||||
nginx-mod-http-echo 1.28.3-r3 apk
|
||||
nginx-mod-http-fancyindex 1.28.3-r3 apk
|
||||
nginx-mod-http-geoip2 1.28.3-r3 apk
|
||||
nginx-mod-http-headers-more 1.28.3-r3 apk
|
||||
nginx-mod-http-image-filter 1.28.3-r3 apk
|
||||
nginx-mod-http-perl 1.28.3-r3 apk
|
||||
nginx-mod-http-redis2 1.28.3-r3 apk
|
||||
nginx-mod-http-set-misc 1.28.3-r3 apk
|
||||
nginx-mod-http-upload-progress 1.28.3-r3 apk
|
||||
nginx-mod-http-xslt-filter 1.28.3-r3 apk
|
||||
nginx-mod-mail 1.28.3-r3 apk
|
||||
nginx-mod-rtmp 1.28.3-r3 apk
|
||||
nginx-mod-stream 1.28.3-r3 apk
|
||||
nginx-mod-stream-geoip2 1.28.3-r3 apk
|
||||
nginx-vim 1.28.3-r3 apk
|
||||
nghttp2-libs 1.65.0-r0 apk
|
||||
nginx 1.28.3-r0 apk
|
||||
nginx-mod-devel-kit 1.28.3-r0 apk
|
||||
nginx-mod-http-brotli 1.28.3-r0 apk
|
||||
nginx-mod-http-dav-ext 1.28.3-r0 apk
|
||||
nginx-mod-http-echo 1.28.3-r0 apk
|
||||
nginx-mod-http-fancyindex 1.28.3-r0 apk
|
||||
nginx-mod-http-geoip2 1.28.3-r0 apk
|
||||
nginx-mod-http-headers-more 1.28.3-r0 apk
|
||||
nginx-mod-http-image-filter 1.28.3-r0 apk
|
||||
nginx-mod-http-perl 1.28.3-r0 apk
|
||||
nginx-mod-http-redis2 1.28.3-r0 apk
|
||||
nginx-mod-http-set-misc 1.28.3-r0 apk
|
||||
nginx-mod-http-upload-progress 1.28.3-r0 apk
|
||||
nginx-mod-http-xslt-filter 1.28.3-r0 apk
|
||||
nginx-mod-mail 1.28.3-r0 apk
|
||||
nginx-mod-rtmp 1.28.3-r0 apk
|
||||
nginx-mod-stream 1.28.3-r0 apk
|
||||
nginx-mod-stream-geoip2 1.28.3-r0 apk
|
||||
nginx-vim 1.28.3-r0 apk
|
||||
npth 1.8-r0 apk
|
||||
oniguruma 6.9.10-r0 apk
|
||||
openssl 3.5.7-r0 apk
|
||||
openssl 3.5.6-r0 apk
|
||||
p11-kit 0.25.5-r2 apk
|
||||
packaging 26.0 python
|
||||
packaging 26.2 python
|
||||
@@ -315,24 +312,22 @@ php84-xmlwriter 8.4.16-r0 apk
|
||||
php84-xsl 8.4.16-r0 apk
|
||||
php84-zip 8.4.16-r0 apk
|
||||
pinentry 1.3.1-r0 apk
|
||||
pip 26.1.2 python
|
||||
pip 26.1 python
|
||||
pkb-client 2.3.1 python
|
||||
platformdirs 4.4.0 python
|
||||
popt 1.19-r4 apk
|
||||
procps-ng 4.0.4-r3 apk
|
||||
proto-plus 1.28.0 python
|
||||
protobuf 7.35.1 python
|
||||
proto-plus 1.27.2 python
|
||||
protobuf 7.34.1 python
|
||||
pyacmedns 0.4 python
|
||||
pyasn1 0.6.3 python
|
||||
pyasn1-modules 0.4.2 python
|
||||
pyc 3.12.13-r0 apk
|
||||
pycparser 3.0 python
|
||||
pydantic 2.13.4 python
|
||||
pydantic-core 2.46.4 python
|
||||
pyjwt 2.13.0 python
|
||||
pyjwt 2.12.1 python
|
||||
pynamecheap 0.0.3 python
|
||||
pyopenssl 26.3.0 python
|
||||
pyotp 2.10.0 python
|
||||
pyopenssl 26.1.0 python
|
||||
pyotp 2.9.0 python
|
||||
pyparsing 3.3.2 python
|
||||
pyrfc3339 2.1.0 python
|
||||
python-dateutil 2.9.0.post0 python
|
||||
@@ -343,29 +338,27 @@ python3-pyc 3.12.13-r0 apk
|
||||
python3-pycache-pyc0 3.12.13-r0 apk
|
||||
pyyaml 6.0.3 python
|
||||
readline 8.2.13-r1 apk
|
||||
requests 2.34.2 python
|
||||
requests 2.33.1 python
|
||||
requests-file 3.0.1 python
|
||||
requests-mock 1.12.1 python
|
||||
requests-unixsocket 0.4.1 python
|
||||
s3transfer 0.19.0 python
|
||||
s3transfer 0.17.0 python
|
||||
scanelf 1.3.8-r1 apk
|
||||
setuptools 82.0.1 python
|
||||
shadow 4.17.3-r0 apk
|
||||
six 1.17.0 python
|
||||
skalibs-libs 2.14.4.0-r0 apk
|
||||
sniffio 1.3.1 python
|
||||
soupsieve 2.8.4 python
|
||||
soupsieve 2.8.3 python
|
||||
sqlite-libs 3.49.2-r1 apk
|
||||
ssl_client 1.37.0-r20 apk
|
||||
tiff 4.7.1-r0 apk
|
||||
tldextract 5.3.1 python
|
||||
tomli 2.4.0 python
|
||||
typing-extensions 4.15.0 python
|
||||
typing-inspection 0.4.2 python
|
||||
tzdata 2026b-r0 apk
|
||||
tzdata 2026a-r0 apk
|
||||
unixodbc 2.3.12-r0 apk
|
||||
uritemplate 4.2.0 python
|
||||
urllib3 2.7.0 python
|
||||
urllib3 2.6.3 python
|
||||
utmps-libs 0.1.3.1-r0 apk
|
||||
wheel 0.46.3 python
|
||||
wheel 0.47.0 python
|
||||
@@ -373,5 +366,5 @@ whois 5.6.3-r0 apk
|
||||
xz-libs 5.8.3-r0 apk
|
||||
zipp 3.23.0 python
|
||||
zlib 1.3.2-r0 apk
|
||||
zope-interface 8.5 python
|
||||
zope-interface 8.4 python
|
||||
zstd-libs 1.5.7-r0 apk
|
||||
|
||||
+1
-1
@@ -219,7 +219,7 @@ init_diagram: |
|
||||
"swag:latest" <- Base Images
|
||||
# changelog
|
||||
changelogs:
|
||||
- {date: "01.06.26:", desc: "Remove obsolete old cert check logic."}
|
||||
- {date: "08.02.26:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Deny access to all dotfiles."}
|
||||
- {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: "04.11.25:", desc: "Switch default Gandi credentials from API Key to Token, allow DNS propagation time for Azure DNS plugin."}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
## Version 2026/03/07 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
## Version 2026/05/05 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
|
||||
# redirect all traffic to https
|
||||
server {
|
||||
@@ -13,9 +13,9 @@ server {
|
||||
# main server block
|
||||
server {
|
||||
listen 443 ssl default_server;
|
||||
# listen 443 quic reuseport default_server;
|
||||
listen [::]:443 ssl default_server;
|
||||
# listen [::]:443 quic reuseport default_server;
|
||||
#listen 443 quic reuseport default_server;
|
||||
#listen [::]:443 quic reuseport default_server;
|
||||
|
||||
server_name _;
|
||||
|
||||
@@ -24,6 +24,18 @@ server {
|
||||
root /config/www;
|
||||
index index.html index.htm index.php;
|
||||
|
||||
# Allow access to the ".well-known" directory
|
||||
location ^~ /.well-known {
|
||||
allow all;
|
||||
}
|
||||
|
||||
# deny access to all dotfiles
|
||||
location ~ /\. {
|
||||
access_log off;
|
||||
log_not_found off;
|
||||
return 404;
|
||||
}
|
||||
|
||||
# enable subfolder method reverse proxy confs
|
||||
include /config/nginx/proxy-confs/*.subfolder.conf;
|
||||
|
||||
@@ -60,7 +72,7 @@ server {
|
||||
}
|
||||
|
||||
location ~ ^(.+\.php)(.*)$ {
|
||||
# enable the next two lines for http auth
|
||||
# enable for basic auth
|
||||
#auth_basic "Restricted";
|
||||
#auth_basic_user_file /config/nginx/.htpasswd;
|
||||
|
||||
@@ -73,17 +85,17 @@ server {
|
||||
# enable for Authentik (requires authentik-server.conf in the server block)
|
||||
#include /config/nginx/authentik-location.conf;
|
||||
|
||||
# enable for Tinyauth (requires tinyauth-server.conf in the server block)
|
||||
#include /config/nginx/tinyauth-location.conf;
|
||||
|
||||
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
||||
if (!-f $document_root$fastcgi_script_name) { return 404; }
|
||||
if (!-f $document_root$fastcgi_script_name) {
|
||||
return 404;
|
||||
}
|
||||
fastcgi_pass 127.0.0.1:9000;
|
||||
fastcgi_index index.php;
|
||||
include /etc/nginx/fastcgi_params;
|
||||
}
|
||||
|
||||
# deny access to .htaccess/.htpasswd files
|
||||
location ~ /\.ht {
|
||||
deny all;
|
||||
}
|
||||
}
|
||||
|
||||
# enable subdomain method reverse proxy confs
|
||||
|
||||
@@ -206,6 +206,18 @@ fi
|
||||
# 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
|
||||
|
||||
# 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 [[ "${CERTPROVIDER}" = "zerossl" ]] && [[ "${STAGING}" = "true" ]]; then
|
||||
echo "ZeroSSL does not support staging mode, ignoring STAGING variable"
|
||||
|
||||
Reference in New Issue
Block a user