mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-03 17:03:35 +09:00
Compare commits
6 Commits
3.0.1-ls33
...
3.0.1-ls34
| Author | SHA1 | Date | |
|---|---|---|---|
|
9971d2f50b | ||
|
|
4e1f959980 | ||
|
f94e685a65 | ||
|
|
bfeeaaaa73 | ||
|
|
4437f6f8ba | ||
|
|
ed7c58a4c3 |
@@ -10,8 +10,10 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="nemchik"
|
||||
|
||||
# environment settings
|
||||
ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
|
||||
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
ENV DHLEVEL=2048 \
|
||||
ONLY_SUBDOMAINS=false \
|
||||
AWS_CONFIG_FILE=/config/dns-conf/route53.ini \
|
||||
S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
|
||||
@@ -10,8 +10,10 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="nemchik"
|
||||
|
||||
# environment settings
|
||||
ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
|
||||
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
ENV DHLEVEL=2048 \
|
||||
ONLY_SUBDOMAINS=false \
|
||||
AWS_CONFIG_FILE=/config/dns-conf/route53.ini \
|
||||
S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
|
||||
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@@ -29,12 +29,12 @@ pipeline {
|
||||
PR_DOCKERHUB_IMAGE = 'lspipepr/swag'
|
||||
DIST_IMAGE = 'alpine'
|
||||
MULTIARCH='true'
|
||||
CI='true'
|
||||
CI='false'
|
||||
CI_WEB='false'
|
||||
CI_PORT='80'
|
||||
CI_SSL='false'
|
||||
CI_DELAY='30'
|
||||
CI_DOCKERENV='TEST_RUN=1'
|
||||
CI_DOCKERENV=''
|
||||
CI_AUTH=''
|
||||
CI_WEBPATH=''
|
||||
}
|
||||
|
||||
@@ -37,7 +37,6 @@ Find us at:
|
||||
[](https://hub.docker.com/r/linuxserver/swag)
|
||||
[](https://hub.docker.com/r/linuxserver/swag)
|
||||
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/master/)
|
||||
[](https://ci-tests.linuxserver.io/linuxserver/swag/latest/index.html)
|
||||
|
||||
SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx webserver and reverse proxy with php support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.
|
||||
|
||||
|
||||
@@ -17,12 +17,12 @@ repo_vars:
|
||||
- PR_DOCKERHUB_IMAGE = 'lspipepr/swag'
|
||||
- DIST_IMAGE = 'alpine'
|
||||
- MULTIARCH='true'
|
||||
- CI='true'
|
||||
- CI='false'
|
||||
- CI_WEB='false'
|
||||
- CI_PORT='80'
|
||||
- CI_SSL='false'
|
||||
- CI_DELAY='30'
|
||||
- CI_DOCKERENV='TEST_RUN=1'
|
||||
- CI_DOCKERENV=''
|
||||
- CI_AUTH=''
|
||||
- CI_WEBPATH=''
|
||||
sponsor_links:
|
||||
|
||||
@@ -21,8 +21,8 @@ azure-mgmt-dns 8.2.0 python
|
||||
backports-tarfile 1.2.0 python
|
||||
bash 5.2.26-r0 apk
|
||||
beautifulsoup4 4.12.3 python
|
||||
boto3 1.35.63 python
|
||||
botocore 1.35.63 python
|
||||
boto3 1.35.71 python
|
||||
botocore 1.35.71 python
|
||||
brotli-libs 1.1.0-r2 apk
|
||||
bs4 0.0.2 python
|
||||
busybox 1.36.1-r29 apk
|
||||
@@ -42,14 +42,14 @@ certbot-dns-cloudflare 3.0.1 python
|
||||
certbot-dns-cpanel 0.4.0 python
|
||||
certbot-dns-desec 1.2.1 python
|
||||
certbot-dns-digitalocean 3.0.1 python
|
||||
certbot-dns-directadmin 1.0.4 python
|
||||
certbot-dns-directadmin 1.0.12 python
|
||||
certbot-dns-dnsimple 3.0.1 python
|
||||
certbot-dns-dnsmadeeasy 3.0.1 python
|
||||
certbot-dns-dnspod 0.1.0 python
|
||||
certbot-dns-do 0.31.0 python
|
||||
certbot-dns-domeneshop 0.2.9 python
|
||||
certbot-dns-dreamhost 1.0 python
|
||||
certbot-dns-duckdns 1.4 python
|
||||
certbot-dns-duckdns 1.5 python
|
||||
certbot-dns-dynudns 0.0.6 python
|
||||
certbot-dns-freedns 0.2.0 python
|
||||
certbot-dns-gehirn 3.0.1 python
|
||||
@@ -65,11 +65,11 @@ certbot-dns-linode 3.0.1 python
|
||||
certbot-dns-loopia 1.0.1 python
|
||||
certbot-dns-luadns 3.0.1 python
|
||||
certbot-dns-namecheap 1.0.0 python
|
||||
certbot-dns-netcup 1.4.3 python
|
||||
certbot-dns-njalla 1.0.0 python
|
||||
certbot-dns-netcup 1.4.4 python
|
||||
certbot-dns-njalla 2.0.0 python
|
||||
certbot-dns-nsone 3.0.1 python
|
||||
certbot-dns-ovh 3.0.1 python
|
||||
certbot-dns-porkbun 0.9 python
|
||||
certbot-dns-porkbun 0.9.1 python
|
||||
certbot-dns-rfc2136 3.0.1 python
|
||||
certbot-dns-route53 3.0.1 python
|
||||
certbot-dns-sakuracloud 3.0.1 python
|
||||
@@ -81,14 +81,14 @@ certifi 2024.8.30 python
|
||||
cffi 1.17.1 python
|
||||
charset-normalizer 3.4.0 python
|
||||
cloudflare 2.19.4 python
|
||||
composer 2.8.1 binary
|
||||
composer 2.8.3 binary
|
||||
configargparse 1.7 python
|
||||
configobj 5.0.9 python
|
||||
coreutils 9.5-r1 apk
|
||||
coreutils-env 9.5-r1 apk
|
||||
coreutils-fmt 9.5-r1 apk
|
||||
coreutils-sha512sum 9.5-r1 apk
|
||||
cryptography 43.0.3 python
|
||||
cryptography 44.0.0 python
|
||||
curl 8.9.1-r2 apk
|
||||
distro 1.9.0 python
|
||||
dns-lexicon 3.18.0 python
|
||||
@@ -116,7 +116,7 @@ gnupg-utils 2.4.5-r0 apk
|
||||
gnupg-wks-client 2.4.5-r0 apk
|
||||
gnutls 3.8.5-r0 apk
|
||||
google-api-core 2.23.0 python
|
||||
google-api-python-client 2.153.0 python
|
||||
google-api-python-client 2.154.0 python
|
||||
google-auth 2.36.0 python
|
||||
google-auth-httplib2 0.2.0 python
|
||||
googleapis-common-protos 1.66.0 python
|
||||
@@ -155,7 +155,7 @@ libcurl 8.9.1-r2 apk
|
||||
libdav1d 1.4.2-r0 apk
|
||||
libedit 20240517.3.1-r0 apk
|
||||
libevent 2.1.12-r7 apk
|
||||
libexpat 2.6.3-r0 apk
|
||||
libexpat 2.6.4-r0 apk
|
||||
libffi 3.4.6-r0 apk
|
||||
libgcc 13.2.1_git20240309-r0 apk
|
||||
libgcrypt 1.10.3-r0 apk
|
||||
@@ -178,7 +178,7 @@ libncursesw 6.4_p20240420-r2 apk
|
||||
libnftnl 1.2.6-r0 apk
|
||||
libpanelw 6.4_p20240420-r2 apk
|
||||
libpng 1.6.44-r0 apk
|
||||
libpq 16.5-r0 apk
|
||||
libpq 16.6-r0 apk
|
||||
libproc2 4.0.4-r0 apk
|
||||
libpsl 0.21.5-r1 apk
|
||||
libsasl 2.1.28-r6 apk
|
||||
@@ -212,7 +212,7 @@ memcached 1.6.27-r0 apk
|
||||
mock 5.1.0 python
|
||||
more-itertools 10.3.0 python
|
||||
mpdecimal 4.0.0-r0 apk
|
||||
msal 1.31.0 python
|
||||
msal 1.31.1 python
|
||||
msal-extensions 1.2.0 python
|
||||
musl 1.2.5-r0 apk
|
||||
musl-utils 1.2.5-r0 apk
|
||||
@@ -252,55 +252,55 @@ pcre2 10.43-r0 apk
|
||||
perl 5.38.2-r0 apk
|
||||
perl-error 0.17029-r2 apk
|
||||
perl-git 2.45.2-r0 apk
|
||||
php83 8.3.13-r0 apk
|
||||
php83-bcmath 8.3.13-r0 apk
|
||||
php83-bz2 8.3.13-r0 apk
|
||||
php83-common 8.3.13-r0 apk
|
||||
php83-ctype 8.3.13-r0 apk
|
||||
php83-curl 8.3.13-r0 apk
|
||||
php83-dom 8.3.13-r0 apk
|
||||
php83-exif 8.3.13-r0 apk
|
||||
php83-fileinfo 8.3.13-r0 apk
|
||||
php83-fpm 8.3.13-r0 apk
|
||||
php83-ftp 8.3.13-r0 apk
|
||||
php83-gd 8.3.13-r0 apk
|
||||
php83-gmp 8.3.13-r0 apk
|
||||
php83-iconv 8.3.13-r0 apk
|
||||
php83-imap 8.3.13-r0 apk
|
||||
php83-intl 8.3.13-r0 apk
|
||||
php83-ldap 8.3.13-r0 apk
|
||||
php83-mbstring 8.3.13-r0 apk
|
||||
php83-mysqli 8.3.13-r0 apk
|
||||
php83-mysqlnd 8.3.13-r0 apk
|
||||
php83-opcache 8.3.13-r0 apk
|
||||
php83-openssl 8.3.13-r0 apk
|
||||
php83-pdo 8.3.13-r0 apk
|
||||
php83-pdo_mysql 8.3.13-r0 apk
|
||||
php83-pdo_odbc 8.3.13-r0 apk
|
||||
php83-pdo_pgsql 8.3.13-r0 apk
|
||||
php83-pdo_sqlite 8.3.13-r0 apk
|
||||
php83-pear 8.3.13-r0 apk
|
||||
php83 8.3.14-r0 apk
|
||||
php83-bcmath 8.3.14-r0 apk
|
||||
php83-bz2 8.3.14-r0 apk
|
||||
php83-common 8.3.14-r0 apk
|
||||
php83-ctype 8.3.14-r0 apk
|
||||
php83-curl 8.3.14-r0 apk
|
||||
php83-dom 8.3.14-r0 apk
|
||||
php83-exif 8.3.14-r0 apk
|
||||
php83-fileinfo 8.3.14-r0 apk
|
||||
php83-fpm 8.3.14-r0 apk
|
||||
php83-ftp 8.3.14-r0 apk
|
||||
php83-gd 8.3.14-r0 apk
|
||||
php83-gmp 8.3.14-r0 apk
|
||||
php83-iconv 8.3.14-r0 apk
|
||||
php83-imap 8.3.14-r0 apk
|
||||
php83-intl 8.3.14-r0 apk
|
||||
php83-ldap 8.3.14-r0 apk
|
||||
php83-mbstring 8.3.14-r0 apk
|
||||
php83-mysqli 8.3.14-r0 apk
|
||||
php83-mysqlnd 8.3.14-r0 apk
|
||||
php83-opcache 8.3.14-r0 apk
|
||||
php83-openssl 8.3.14-r0 apk
|
||||
php83-pdo 8.3.14-r0 apk
|
||||
php83-pdo_mysql 8.3.14-r0 apk
|
||||
php83-pdo_odbc 8.3.14-r0 apk
|
||||
php83-pdo_pgsql 8.3.14-r0 apk
|
||||
php83-pdo_sqlite 8.3.14-r0 apk
|
||||
php83-pear 8.3.14-r0 apk
|
||||
php83-pecl-apcu 5.1.23-r0 apk
|
||||
php83-pecl-igbinary 3.2.15-r0 apk
|
||||
php83-pecl-mcrypt 1.0.7-r0 apk
|
||||
php83-pecl-memcached 3.3.0-r0 apk
|
||||
php83-pecl-msgpack 2.2.0-r2 apk
|
||||
php83-pecl-redis 6.1.0-r0 apk
|
||||
php83-pgsql 8.3.13-r0 apk
|
||||
php83-phar 8.3.13-r0 apk
|
||||
php83-posix 8.3.13-r0 apk
|
||||
php83-session 8.3.13-r0 apk
|
||||
php83-simplexml 8.3.13-r0 apk
|
||||
php83-soap 8.3.13-r0 apk
|
||||
php83-sockets 8.3.13-r0 apk
|
||||
php83-sodium 8.3.13-r0 apk
|
||||
php83-sqlite3 8.3.13-r0 apk
|
||||
php83-tokenizer 8.3.13-r0 apk
|
||||
php83-xml 8.3.13-r0 apk
|
||||
php83-xmlreader 8.3.13-r0 apk
|
||||
php83-xmlwriter 8.3.13-r0 apk
|
||||
php83-xsl 8.3.13-r0 apk
|
||||
php83-zip 8.3.13-r0 apk
|
||||
php83-pgsql 8.3.14-r0 apk
|
||||
php83-phar 8.3.14-r0 apk
|
||||
php83-posix 8.3.14-r0 apk
|
||||
php83-session 8.3.14-r0 apk
|
||||
php83-simplexml 8.3.14-r0 apk
|
||||
php83-soap 8.3.14-r0 apk
|
||||
php83-sockets 8.3.14-r0 apk
|
||||
php83-sodium 8.3.14-r0 apk
|
||||
php83-sqlite3 8.3.14-r0 apk
|
||||
php83-tokenizer 8.3.14-r0 apk
|
||||
php83-xml 8.3.14-r0 apk
|
||||
php83-xmlreader 8.3.14-r0 apk
|
||||
php83-xmlwriter 8.3.14-r0 apk
|
||||
php83-xsl 8.3.14-r0 apk
|
||||
php83-zip 8.3.14-r0 apk
|
||||
pinentry 1.3.0-r0 apk
|
||||
pip 24.3.1 python
|
||||
pkb-client 2.0.0 python
|
||||
@@ -309,15 +309,15 @@ popt 1.19-r3 apk
|
||||
portalocker 2.10.1 python
|
||||
procps-ng 4.0.4-r0 apk
|
||||
proto-plus 1.25.0 python
|
||||
protobuf 5.28.3 python
|
||||
protobuf 5.29.0 python
|
||||
pyacmedns 0.4 python
|
||||
pyasn1 0.6.1 python
|
||||
pyasn1-modules 0.4.1 python
|
||||
pyc 3.12.7-r0 apk
|
||||
pycparser 2.22 python
|
||||
pyjwt 2.9.0 python
|
||||
pyjwt 2.10.1 python
|
||||
pynamecheap 0.0.3 python
|
||||
pyopenssl 24.2.1 python
|
||||
pyopenssl 24.3.0 python
|
||||
pyotp 2.9.0 python
|
||||
pyparsing 3.2.0 python
|
||||
pyrfc3339 2.0.1 python
|
||||
@@ -334,9 +334,9 @@ requests 2.32.3 python
|
||||
requests-file 2.1.0 python
|
||||
requests-mock 1.12.1 python
|
||||
rsa 4.9 python
|
||||
s3transfer 0.10.3 python
|
||||
s3transfer 0.10.4 python
|
||||
scanelf 1.3.7-r2 apk
|
||||
setuptools 75.5.0 python
|
||||
setuptools 75.6.0 python
|
||||
shadow 4.15.1-r0 apk
|
||||
six 1.16.0 python
|
||||
skalibs 2.14.1.1-r0 apk
|
||||
@@ -354,10 +354,10 @@ uritemplate 4.1.1 python
|
||||
urllib3 2.2.3 python
|
||||
utmps-libs 0.1.2.2-r1 apk
|
||||
wheel 0.43.0 python
|
||||
wheel 0.45.0 python
|
||||
wheel 0.45.1 python
|
||||
whois 5.5.23-r0 apk
|
||||
xz-libs 5.6.2-r0 apk
|
||||
zipp 3.19.2 python
|
||||
zlib 1.3.1-r1 apk
|
||||
zope-interface 7.1.1 python
|
||||
zope-interface 7.2 python
|
||||
zstd-libs 1.5.6-r0 apk
|
||||
|
||||
0
root/app/le-renew.sh
Normal file → Executable file
0
root/app/le-renew.sh
Normal file → Executable file
@@ -2,12 +2,12 @@
|
||||
# shellcheck shell=bash
|
||||
|
||||
if ! iptables -L &> /dev/null; then
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/iptables
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/iptables-save
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/iptables-restore
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-save
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-restore
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/iptables
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/iptables-save
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/iptables-restore
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-save
|
||||
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-restore
|
||||
fi
|
||||
|
||||
# copy/update the fail2ban config defaults to/in /config
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-folders-config/run
|
||||
@@ -1 +0,0 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-nginx-config/run
|
||||
@@ -6,4 +6,6 @@ lsiown -R abc:abc \
|
||||
/config
|
||||
chmod -R 0644 /etc/logrotate.d
|
||||
chmod -R +r /config/log
|
||||
chmod +x /app/le-renew.sh
|
||||
|
||||
# Workaround for systems with chmod errors
|
||||
true
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-samples-config/run
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-swag-config/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-swag-config/up
Normal file
@@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-swag-config/run
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-swag-folders/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-swag-folders/up
Normal file
@@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-swag-folders/run
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-swag-samples/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-swag-samples/up
Normal file
@@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-swag-samples/run
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
# shellcheck shell=bash
|
||||
|
||||
# Echo init finish for test runs
|
||||
if [[ -n "${TEST_RUN}" ]]; then
|
||||
echo '[services.d] done.'
|
||||
fi
|
||||
@@ -1 +0,0 @@
|
||||
oneshot
|
||||
@@ -1 +0,0 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-test-run/run
|
||||
Reference in New Issue
Block a user