From 0a1b8cf8011ad9d74951f8bb249d326694007cbf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 18 Dec 2020 14:00:19 +0000 Subject: [PATCH 1/9] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 37 ------------------------------- Jenkinsfile | 46 +++++++++++++++++++++++++++++++-------- README.md | 2 +- 3 files changed, 38 insertions(+), 47 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 7f834db..8b13789 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,38 +1 @@ -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - ------------------------------- - -## Expected Behavior - - -## Current Behavior - - -## Steps to Reproduce - - -1. -2. -3. -4. - -## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** - - - -## Command used to create docker container (run/create/compose/screenshot) - - -## Docker logs - diff --git a/Jenkinsfile b/Jenkinsfile index 7234085..cdbe290 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -135,6 +135,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN } @@ -156,6 +157,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' @@ -177,6 +179,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST @@ -238,9 +241,12 @@ pipeline { git checkout -f master cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} + git rm .github/ISSUE_TEMPLATE.md || : git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} @@ -310,8 +316,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -323,8 +330,9 @@ pipeline { parallel { stage('Build X86') { steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -332,12 +340,13 @@ pipeline { label 'ARMHF' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -352,12 +361,13 @@ pipeline { label 'ARM64' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -430,6 +440,13 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + sh '''#! /bin/bash + echo "Packages were updated. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -447,6 +464,13 @@ pipeline { } } steps { + sh '''#! /bin/bash + echo "There are no package updates. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -536,7 +560,7 @@ pipeline { ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ @@ -600,6 +624,7 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 @@ -614,10 +639,13 @@ pipeline { docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest || : + ${DELETEIMAGE}:arm64v8-latest \ + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ @@ -684,7 +712,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index 64b252b..dde826b 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Find us at: [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-swag) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-swag/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-swag/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-swag/container_registry) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-swag/container_registry) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/swag "Get your own version badge on microbadger.com") [![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) From b91ce7bd1afeef89518d877ebddf5016d2240e0d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 18 Dec 2020 14:01:54 +0000 Subject: [PATCH 2/9] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 1 - .github/ISSUE_TEMPLATE/config.yml | 13 ++++++ .github/ISSUE_TEMPLATE/issue.bug.md | 40 +++++++++++++++++++ .github/ISSUE_TEMPLATE/issue.feature.md | 25 ++++++++++++ .github/workflows/external_trigger.yml | 1 + .../workflows/external_trigger_scheduler.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- 7 files changed, 81 insertions(+), 3 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100755 .github/ISSUE_TEMPLATE/config.yml create mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md create mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 8b13789..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100755 index 0000000..333e042 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,13 @@ +blank_issues_enabled: false +contact_links: + - name: Discord chat support + url: https://discord.gg/YWrKVTn + about: Realtime support / chat with the community and the team. + + - name: Discourse discussion forum + url: https://discourse.linuxserver.io + about: Post on our community forum. + + - name: Documentation + url: https://docs.linuxserver.io/images/docker-swag + about: Documentation - information about all of our containers. diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md new file mode 100755 index 0000000..4b97561 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.md @@ -0,0 +1,40 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + +------------------------------ + +## Expected Behavior + + +## Current Behavior + + +## Steps to Reproduce + + +1. +2. +3. +4. + +## Environment +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + + + +## Command used to create docker container (run/create/compose/screenshot) + + +## Docker logs + diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md new file mode 100755 index 0000000..20a91fd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.md @@ -0,0 +1,25 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + + + + +------------------------------ + +## Desired Behavior + + +## Current Behavior + + +## Alternatives Considered + diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c65b7fa..1e6221d 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -27,6 +27,7 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi + EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') echo "**** External version: ${EXT_RELEASE} ****" echo "**** Retrieving last pushed version ****" image="linuxserver/swag" diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index bdd8245..632e265 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2.3.3 with: fetch-depth: '0' - + - name: External Trigger Scheduler run: | echo "**** Branches found: ****" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 4a8d36c..3e0a141 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2.3.3 with: fetch-depth: '0' - + - name: Package Trigger Scheduler run: | echo "**** Branches found: ****" From 236553d1199929baf0a8ead3c553505f9d119cef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 18 Dec 2020 14:17:25 +0000 Subject: [PATCH 3/9] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 95b23fd..bd9b19e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ c-client-2007f-r11 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.69.1-r2 +curl-7.69.1-r3 db-5.3.28-r1 expat-2.2.9-r1 fail2ban-0.11.1-r3 @@ -35,8 +35,8 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.27-r0 -libcrypto1.1-1.1.1g-r0 -libcurl-7.69.1-r2 +libcrypto1.1-1.1.1i-r0 +libcurl-7.69.1-r3 libedit-20191231.3.1-r0 libevent-2.1.11-r1 libffi-3.3-r2 @@ -67,7 +67,7 @@ libseccomp-2.4.3-r0 libsecret-0.20.3-r0 libsm-1.2.3-r0 libsodium-1.0.18-r0 -libssl1.1-1.1.1g-r0 +libssl1.1-1.1.1i-r0 libstdc++-9.3.0-r2 libtasn1-4.16.0-r1 libtls-standalone-2.9.1-r1 @@ -116,8 +116,8 @@ nginx-mod-stream-1.18.0-r1 nginx-mod-stream-geoip2-1.18.0-r1 nginx-vim-1.18.0-r1 npth-1.6-r0 -openssl-1.1.1g-r0 -p11-kit-0.23.20-r5 +openssl-1.1.1i-r0 +p11-kit-0.23.22-r0 pcre-8.44-r0 pcre2-10.35-r0 perl-5.30.3-r0 From 76f0a8c34cc7bf03185189e1e90c02a4a9a6f3b4 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Wed, 30 Dec 2020 22:58:59 +0100 Subject: [PATCH 4/9] Added helpers Replaced index.html with page with some info, including a the swag documentation. Added http502 helper page, also linking to our docs. UI suggestions welcome --- readme-vars.yml | 1 + root/defaults/502.html | 44 ++++++++++++++++++++++++++++++++++ root/defaults/default | 2 ++ root/defaults/index.html | 39 ++++++++++++++++++++++++++++++ root/etc/cont-init.d/50-config | 2 ++ 5 files changed, 88 insertions(+) create mode 100644 root/defaults/502.html create mode 100644 root/defaults/index.html diff --git a/readme-vars.yml b/readme-vars.yml index cfcdcef..d86b110 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -150,6 +150,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "30.12.20:", desc: "Add helper pages to aid troubleshooting" } - { date: "10.12.20:", desc: "Add support for njalla dns validation" } - { date: "09.12.20:", desc: "Check for template/conf updates and notify in the log. Add support for gehirn and sakuracloud dns validation." } - { date: "01.11.20:", desc: "Add support for netcup dns validation" } diff --git a/root/defaults/502.html b/root/defaults/502.html new file mode 100644 index 0000000..a7e290f --- /dev/null +++ b/root/defaults/502.html @@ -0,0 +1,44 @@ + + + 502 + + + +
+

502

+

Nginx can not connect to the application

+

Some common reasons are listed here: docs.linuxserver.io

+

For help and support, please visit: inuxserver.io/support

+
+ + \ No newline at end of file diff --git a/root/defaults/default b/root/defaults/default index c4b27ae..5dea1c1 100644 --- a/root/defaults/default +++ b/root/defaults/default @@ -1,5 +1,7 @@ ## Version 2020/05/23 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/default +error_page 502 /502.html; + # redirect all traffic to https server { listen 80 default_server; diff --git a/root/defaults/index.html b/root/defaults/index.html new file mode 100644 index 0000000..8244bef --- /dev/null +++ b/root/defaults/index.html @@ -0,0 +1,39 @@ + + + Welcome to your SWAG instance + + + +
+

Welcome to your SWAG instance

+

A webserver and reverse proxy solution brought to you by linuxserver.io with php support and a built-in Certbot client.

+

We have a article on how to use swag here: docs.linuxserver.io

+

For help and support, please visit: inuxserver.io/support

+
+ + \ No newline at end of file diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 11bb247..2ec9d4f 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -77,6 +77,8 @@ cp /config/fail2ban/jail.local /etc/fail2ban/jail.local cp /defaults/authelia-location.conf /config/nginx/authelia-location.conf [[ ! -f /config/nginx/geoip2.conf ]] && \ cp /defaults/geoip2.conf /config/nginx/geoip2.conf +[[ ! -f /config/www/502.html ]] && + cp /defaults/502.html /config/www/502.html # copy pre-generated dhparams or generate if needed [[ ! -f /config/nginx/dhparams.pem ]] && \ From df74c02b4dd949ca3d5b543a312be71b036eb50f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 1 Jan 2021 09:13:46 -0500 Subject: [PATCH 5/9] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index bd9b19e..45c901c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -51,7 +51,7 @@ libjpeg-turbo-2.0.5-r0 libksba-1.4.0-r0 libldap-2.4.50-r1 libmagic-5.38-r0 -libmaxminddb-1.4.2-r1 +libmaxminddb-1.4.3-r0 libmcrypt-2.5.8-r8 libmemcached-libs-1.0.18-r4 libmnl-1.0.4-r0 From 6ebfdc1e8721fd2c558d37acedee88d1d7d9e4dc Mon Sep 17 00:00:00 2001 From: Roxedus Date: Sun, 3 Jan 2021 20:23:48 +0100 Subject: [PATCH 6/9] Update dates --- readme-vars.yml | 2 +- root/defaults/default | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index d86b110..d15468c 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -150,7 +150,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: - - { date: "30.12.20:", desc: "Add helper pages to aid troubleshooting" } + - { date: "03.01.21:", desc: "Add helper pages to aid troubleshooting" } - { date: "10.12.20:", desc: "Add support for njalla dns validation" } - { date: "09.12.20:", desc: "Check for template/conf updates and notify in the log. Add support for gehirn and sakuracloud dns validation." } - { date: "01.11.20:", desc: "Add support for netcup dns validation" } diff --git a/root/defaults/default b/root/defaults/default index 5dea1c1..6d76de6 100644 --- a/root/defaults/default +++ b/root/defaults/default @@ -1,4 +1,4 @@ -## Version 2020/05/23 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/default +## Version 2021/01/03 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/default error_page 502 /502.html; From 0c7bc26fc28fbccbba4e566234902a58d68f1c4e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 Jan 2021 09:19:46 -0500 Subject: [PATCH 7/9] Bot Updating Package Versions --- package_versions.txt | 80 ++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 45c901c..550d04e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -123,55 +123,55 @@ pcre2-10.35-r0 perl-5.30.3-r0 perl-error-0.17029-r0 perl-git-2.26.2-r0 -php7-7.3.25-r0 -php7-bcmath-7.3.25-r0 -php7-bz2-7.3.25-r0 -php7-common-7.3.25-r0 -php7-ctype-7.3.25-r0 -php7-curl-7.3.25-r0 -php7-dom-7.3.25-r0 -php7-exif-7.3.25-r0 +php7-7.3.26-r0 +php7-bcmath-7.3.26-r0 +php7-bz2-7.3.26-r0 +php7-common-7.3.26-r0 +php7-ctype-7.3.26-r0 +php7-curl-7.3.26-r0 +php7-dom-7.3.26-r0 +php7-exif-7.3.26-r0 php7-fileinfo-7.3.25-r0 php7-fpm-7.3.25-r0 -php7-ftp-7.3.25-r0 -php7-gd-7.3.25-r0 -php7-iconv-7.3.25-r0 -php7-imap-7.3.25-r0 -php7-intl-7.3.25-r0 -php7-json-7.3.25-r0 -php7-ldap-7.3.25-r0 -php7-mbstring-7.3.25-r0 -php7-mysqli-7.3.25-r0 -php7-mysqlnd-7.3.25-r0 -php7-opcache-7.3.25-r0 -php7-openssl-7.3.25-r0 -php7-pdo-7.3.25-r0 -php7-pdo_mysql-7.3.25-r0 -php7-pdo_odbc-7.3.25-r0 -php7-pdo_pgsql-7.3.25-r0 -php7-pdo_sqlite-7.3.25-r0 -php7-pear-7.3.25-r0 +php7-ftp-7.3.26-r0 +php7-gd-7.3.26-r0 +php7-iconv-7.3.26-r0 +php7-imap-7.3.26-r0 +php7-intl-7.3.26-r0 +php7-json-7.3.26-r0 +php7-ldap-7.3.26-r0 +php7-mbstring-7.3.26-r0 +php7-mysqli-7.3.26-r0 +php7-mysqlnd-7.3.26-r0 +php7-opcache-7.3.26-r0 +php7-openssl-7.3.26-r0 +php7-pdo-7.3.26-r0 +php7-pdo_mysql-7.3.26-r0 +php7-pdo_odbc-7.3.26-r0 +php7-pdo_pgsql-7.3.26-r0 +php7-pdo_sqlite-7.3.26-r0 +php7-pear-7.3.26-r0 php7-pecl-apcu-5.1.19-r0 php7-pecl-igbinary-3.1.6-r0 php7-pecl-mcrypt-1.0.3-r0 php7-pecl-memcached-3.1.5-r0 php7-pecl-redis-5.2.2-r1 -php7-pgsql-7.3.25-r0 -php7-phar-7.3.25-r0 -php7-posix-7.3.25-r0 -php7-session-7.3.25-r0 +php7-pgsql-7.3.26-r0 +php7-phar-7.3.26-r0 +php7-posix-7.3.26-r0 +php7-session-7.3.26-r0 php7-simplexml-7.3.25-r0 -php7-soap-7.3.25-r0 -php7-sockets-7.3.25-r0 -php7-sodium-7.3.25-r0 -php7-sqlite3-7.3.25-r0 -php7-tokenizer-7.3.25-r0 -php7-xml-7.3.25-r0 -php7-xmlreader-7.3.25-r0 -php7-xmlrpc-7.3.25-r0 +php7-soap-7.3.26-r0 +php7-sockets-7.3.26-r0 +php7-sodium-7.3.26-r0 +php7-sqlite3-7.3.26-r0 +php7-tokenizer-7.3.26-r0 +php7-xml-7.3.26-r0 +php7-xmlreader-7.3.26-r0 +php7-xmlrpc-7.3.26-r0 php7-xmlwriter-7.3.25-r0 -php7-xsl-7.3.25-r0 -php7-zip-7.3.25-r0 +php7-xsl-7.3.26-r0 +php7-zip-7.3.26-r0 pinentry-1.1.0-r2 popt-1.16-r7 procps-3.3.16-r0 From 77a82f71638b6ebada644cf57fe16c3aeb835668 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Fri, 8 Jan 2021 15:47:36 +0100 Subject: [PATCH 8/9] Fix issues from review --- root/defaults/502.html | 2 +- root/defaults/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/root/defaults/502.html b/root/defaults/502.html index a7e290f..ff7d8fc 100644 --- a/root/defaults/502.html +++ b/root/defaults/502.html @@ -38,7 +38,7 @@

502

Nginx can not connect to the application

Some common reasons are listed here: docs.linuxserver.io

-

For help and support, please visit: inuxserver.io/support

+

For help and support, please visit: linuxserver.io/support

\ No newline at end of file diff --git a/root/defaults/index.html b/root/defaults/index.html index 8244bef..352d1af 100644 --- a/root/defaults/index.html +++ b/root/defaults/index.html @@ -32,8 +32,8 @@

Welcome to your SWAG instance

A webserver and reverse proxy solution brought to you by linuxserver.io with php support and a built-in Certbot client.

-

We have a article on how to use swag here: docs.linuxserver.io

-

For help and support, please visit: inuxserver.io/support

+

We have an article on how to use swag here: docs.linuxserver.io

+

For help and support, please visit: linuxserver.io/support

\ No newline at end of file From bb53d24b40a241aedf0b3eaee41b89c14ab95adc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 Jan 2021 15:13:54 +0000 Subject: [PATCH 9/9] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dde826b..55d5b09 100644 --- a/README.md +++ b/README.md @@ -323,6 +323,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **03.01.21:** - Add helper pages to aid troubleshooting * **10.12.20:** - Add support for njalla dns validation * **09.12.20:** - Check for template/conf updates and notify in the log. Add support for gehirn and sakuracloud dns validation. * **01.11.20:** - Add support for netcup dns validation