Infra-Mirrors/docker-swag
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-swag.git synced 2024-12-18 12:14:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #521 from linuxserver/tidy-init

Browse Source
This commit is contained in:
Adam 2024-11-16 16:35:20 +00:00 committed by GitHub
commit 4437f6f8ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
34 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -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 ****" && \

6
Dockerfile.aarch64
View File

@ -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
View File

@ -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=''
} }

1
README.md
View File

@ -37,7 +37,6 @@ Find us at:
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/swag) [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/swag)
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/swag) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/swag)
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-swag%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/master/) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-swag%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/master/)
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fswag%2Flatest%2Fci-status.yml)](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.

4
jenkins-vars.yml
View File

@ -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:

0
root/app/le-renew.sh Normal file → Executable file
View File

0
root/etc/s6-overlay/s6-rc.d/init-certbot-config/dependencies.d/init-nginx-config → root/etc/s6-overlay/s6-rc.d/init-certbot-config/dependencies.d/init-swag-config
View File

0
root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/dependencies.d/init-samples-config → root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/dependencies.d/init-swag-samples
View File

12
root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/run
View 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
root/etc/s6-overlay/s6-rc.d/init-folders-config/up
View File

@ -1 +0,0 @@
/etc/s6-overlay/s6-rc.d/init-folders-config/run

1
root/etc/s6-overlay/s6-rc.d/init-nginx-config/up
View File

@ -1 +0,0 @@
/etc/s6-overlay/s6-rc.d/init-nginx-config/run

1
root/etc/s6-overlay/s6-rc.d/init-permissions-config/run
View File

@ -6,4 +6,3 @@ 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

0
root/etc/s6-overlay/s6-rc.d/init-folders-config/dependencies.d/init-require-url → root/etc/s6-overlay/s6-rc.d/init-require-url/dependencies.d/init-config
View File

1
root/etc/s6-overlay/s6-rc.d/init-samples-config/up
View File

@ -1 +0,0 @@
/etc/s6-overlay/s6-rc.d/init-samples-config/run

0
root/etc/s6-overlay/s6-rc.d/init-nginx-config/dependencies.d/init-fail2ban-config → root/etc/s6-overlay/s6-rc.d/init-swag-config/dependencies.d/init-fail2ban-config
View File

0
root/etc/s6-overlay/s6-rc.d/init-nginx-config/run → root/etc/s6-overlay/s6-rc.d/init-swag-config/run
View File

0
root/etc/s6-overlay/s6-rc.d/init-folders-config/type → root/etc/s6-overlay/s6-rc.d/init-swag-config/type
View File

1
root/etc/s6-overlay/s6-rc.d/init-swag-config/up Normal file
View File

@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-swag-config/run

0
root/etc/s6-overlay/s6-rc.d/init-require-url/dependencies.d/init-test-run → root/etc/s6-overlay/s6-rc.d/init-swag-folders/dependencies.d/init-require-url
View File

0
root/etc/s6-overlay/s6-rc.d/init-folders-config/run → root/etc/s6-overlay/s6-rc.d/init-swag-folders/run
View File

0
root/etc/s6-overlay/s6-rc.d/init-nginx-config/type → root/etc/s6-overlay/s6-rc.d/init-swag-folders/type
View File

1
root/etc/s6-overlay/s6-rc.d/init-swag-folders/up Normal file
View File

@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-swag-folders/run

0
root/etc/s6-overlay/s6-rc.d/init-samples-config/dependencies.d/init-folders-config → root/etc/s6-overlay/s6-rc.d/init-swag-samples/dependencies.d/init-swag-folders
View File

0
root/etc/s6-overlay/s6-rc.d/init-samples-config/run → root/etc/s6-overlay/s6-rc.d/init-swag-samples/run
View File

0
root/etc/s6-overlay/s6-rc.d/init-samples-config/type → root/etc/s6-overlay/s6-rc.d/init-swag-samples/type
View File

1
root/etc/s6-overlay/s6-rc.d/init-swag-samples/up Normal file
View File

@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-swag-samples/run

7
root/etc/s6-overlay/s6-rc.d/init-test-run/run
View File

@ -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
root/etc/s6-overlay/s6-rc.d/init-test-run/type
View File

@ -1 +0,0 @@
oneshot

1
root/etc/s6-overlay/s6-rc.d/init-test-run/up
View File

@ -1 +0,0 @@
/etc/s6-overlay/s6-rc.d/init-test-run/run

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/init-samples-config
View File

0
root/etc/s6-overlay/s6-rc.d/init-test-run/dependencies.d/init-nginx-end → root/etc/s6-overlay/s6-rc.d/user/contents.d/init-swag-config
View File

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/init-folders-config → root/etc/s6-overlay/s6-rc.d/user/contents.d/init-swag-folders
View File

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx-config → root/etc/s6-overlay/s6-rc.d/user/contents.d/init-swag-samples
View File

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/init-test-run
View File