mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-21 21:49:04 +09:00
Compare commits
6 Commits
3.0.1-ls33
...
3.0.1-ls34
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e1f959980 | ||
|
|
f94e685a65 | ||
|
|
bfeeaaaa73 | ||
|
|
4437f6f8ba | ||
|
|
ed7c58a4c3 | ||
|
|
ca3830de35 |
@@ -10,8 +10,10 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
|||||||
LABEL maintainer="nemchik"
|
LABEL maintainer="nemchik"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
|
ENV DHLEVEL=2048 \
|
||||||
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
ONLY_SUBDOMAINS=false \
|
||||||
|
AWS_CONFIG_FILE=/config/dns-conf/route53.ini \
|
||||||
|
S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** install build packages ****" && \
|
echo "**** install build packages ****" && \
|
||||||
|
|||||||
@@ -10,8 +10,10 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
|||||||
LABEL maintainer="nemchik"
|
LABEL maintainer="nemchik"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
|
ENV DHLEVEL=2048 \
|
||||||
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
ONLY_SUBDOMAINS=false \
|
||||||
|
AWS_CONFIG_FILE=/config/dns-conf/route53.ini \
|
||||||
|
S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** install build packages ****" && \
|
echo "**** install build packages ****" && \
|
||||||
|
|||||||
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@@ -29,12 +29,12 @@ pipeline {
|
|||||||
PR_DOCKERHUB_IMAGE = 'lspipepr/swag'
|
PR_DOCKERHUB_IMAGE = 'lspipepr/swag'
|
||||||
DIST_IMAGE = 'alpine'
|
DIST_IMAGE = 'alpine'
|
||||||
MULTIARCH='true'
|
MULTIARCH='true'
|
||||||
CI='true'
|
CI='false'
|
||||||
CI_WEB='false'
|
CI_WEB='false'
|
||||||
CI_PORT='80'
|
CI_PORT='80'
|
||||||
CI_SSL='false'
|
CI_SSL='false'
|
||||||
CI_DELAY='30'
|
CI_DELAY='30'
|
||||||
CI_DOCKERENV='TEST_RUN=1'
|
CI_DOCKERENV=''
|
||||||
CI_AUTH=''
|
CI_AUTH=''
|
||||||
CI_WEBPATH=''
|
CI_WEBPATH=''
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ Find us at:
|
|||||||
[](https://hub.docker.com/r/linuxserver/swag)
|
[](https://hub.docker.com/r/linuxserver/swag)
|
||||||
[](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.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.
|
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'
|
- PR_DOCKERHUB_IMAGE = 'lspipepr/swag'
|
||||||
- DIST_IMAGE = 'alpine'
|
- DIST_IMAGE = 'alpine'
|
||||||
- MULTIARCH='true'
|
- MULTIARCH='true'
|
||||||
- CI='true'
|
- CI='false'
|
||||||
- CI_WEB='false'
|
- CI_WEB='false'
|
||||||
- CI_PORT='80'
|
- CI_PORT='80'
|
||||||
- CI_SSL='false'
|
- CI_SSL='false'
|
||||||
- CI_DELAY='30'
|
- CI_DELAY='30'
|
||||||
- CI_DOCKERENV='TEST_RUN=1'
|
- CI_DOCKERENV=''
|
||||||
- CI_AUTH=''
|
- CI_AUTH=''
|
||||||
- CI_WEBPATH=''
|
- CI_WEBPATH=''
|
||||||
sponsor_links:
|
sponsor_links:
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ azure-mgmt-dns 8.2.0 python
|
|||||||
backports-tarfile 1.2.0 python
|
backports-tarfile 1.2.0 python
|
||||||
bash 5.2.26-r0 apk
|
bash 5.2.26-r0 apk
|
||||||
beautifulsoup4 4.12.3 python
|
beautifulsoup4 4.12.3 python
|
||||||
boto3 1.35.60 python
|
boto3 1.35.63 python
|
||||||
botocore 1.35.60 python
|
botocore 1.35.63 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.36.1-r29 apk
|
busybox 1.36.1-r29 apk
|
||||||
@@ -178,7 +178,7 @@ libncursesw 6.4_p20240420-r2 apk
|
|||||||
libnftnl 1.2.6-r0 apk
|
libnftnl 1.2.6-r0 apk
|
||||||
libpanelw 6.4_p20240420-r2 apk
|
libpanelw 6.4_p20240420-r2 apk
|
||||||
libpng 1.6.44-r0 apk
|
libpng 1.6.44-r0 apk
|
||||||
libpq 16.4-r0 apk
|
libpq 16.5-r0 apk
|
||||||
libproc2 4.0.4-r0 apk
|
libproc2 4.0.4-r0 apk
|
||||||
libpsl 0.21.5-r1 apk
|
libpsl 0.21.5-r1 apk
|
||||||
libsasl 2.1.28-r6 apk
|
libsasl 2.1.28-r6 apk
|
||||||
@@ -315,7 +315,7 @@ pyasn1 0.6.1 python
|
|||||||
pyasn1-modules 0.4.1 python
|
pyasn1-modules 0.4.1 python
|
||||||
pyc 3.12.7-r0 apk
|
pyc 3.12.7-r0 apk
|
||||||
pycparser 2.22 python
|
pycparser 2.22 python
|
||||||
pyjwt 2.9.0 python
|
pyjwt 2.10.0 python
|
||||||
pynamecheap 0.0.3 python
|
pynamecheap 0.0.3 python
|
||||||
pyopenssl 24.2.1 python
|
pyopenssl 24.2.1 python
|
||||||
pyotp 2.9.0 python
|
pyotp 2.9.0 python
|
||||||
|
|||||||
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
|
# shellcheck shell=bash
|
||||||
|
|
||||||
if ! iptables -L &> /dev/null; then
|
if ! iptables -L &> /dev/null; then
|
||||||
ln -sf /sbin/xtables-legacy-multi /sbin/iptables
|
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-save
|
||||||
ln -sf /sbin/xtables-legacy-multi /sbin/iptables-restore
|
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
|
||||||
ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-save
|
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/ip6tables-restore
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# copy/update the fail2ban config defaults to/in /config
|
# 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
|
/config
|
||||||
chmod -R 0644 /etc/logrotate.d
|
chmod -R 0644 /etc/logrotate.d
|
||||||
chmod -R +r /config/log
|
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