Bot Updating Package Versions

rebase to 3.14

.editorconfig

@@ -0,0 +1,20 @@
+# This file is globally distributed to all container image projects from
+# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+# trim_trailing_whitespace may cause unintended issues and should not be globally set true
+trim_trailing_whitespace = false
+
+[{Dockerfile*,**.yml}]
+indent_style = space
+indent_size = 2
+
+[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
+indent_style = space
+indent_size = 4

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 * While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
 * Read, and fill the Pull Request template
-  * If this is a fix for a typo in code or documentation in the README please file an issue
+  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
   * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
 * If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@
 
 <!--- Before submitting a pull request please check the following -->
 
-<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  -->
+<!---  If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR  -->
 <!---  Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
 <!---  That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message   -->
 <!---  You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v1
+    - uses: actions/stale@v3
       with:
         stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
         stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
 
 # set version label
 ARG BUILD_DATE
@@ -139,7 +139,7 @@ RUN \
     /tmp/proxy.tar.gz -C \
     /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \
   echo "**** configure nginx ****" && \
-  rm -f /etc/nginx/conf.d/default.conf && \
+  rm -f /etc/nginx/http.d/default.conf && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.13
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
 
 # set version label
 ARG BUILD_DATE
@@ -139,7 +139,7 @@ RUN \
     /tmp/proxy.tar.gz -C \
     /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \
   echo "**** configure nginx ****" && \
-  rm -f /etc/nginx/conf.d/default.conf && \
+  rm -f /etc/nginx/http.d/default.conf && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.13
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
 
 # set version label
 ARG BUILD_DATE
@@ -139,7 +139,7 @@ RUN \
     /tmp/proxy.tar.gz -C \
     /defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \
   echo "**** configure nginx ****" && \
-  rm -f /etc/nginx/conf.d/default.conf && \
+  rm -f /etc/nginx/http.d/default.conf && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

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/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.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/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -260,7 +260,6 @@ pipeline {
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
                 git checkout -f master
-                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 for i in ${TEMPLATES_TO_DELETE}; do
                   git rm "${i}"
                 done
@@ -521,6 +520,15 @@ pipeline {
                   apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
                   sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
                   chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "fedora" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  rpm -qa > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "arch" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  pacman -Q > /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
               fi
               NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@@ -794,7 +802,7 @@ pipeline {
               echo '{"tag_name":"'${META_TAG}'",\
                      "target_commitish": "master",\
                      "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**PIP Changes:**\\n\\n' > start
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**PIP Changes:**\\n\\n' > start
               printf '","draft": false,"prerelease": false}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''

README.md

@@ -33,7 +33,6 @@ Find us at:
 [![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)
-[![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)
 [![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/)
@@ -131,9 +130,7 @@ This will *ask* Google et al not to index and list your site. Be careful with th
 
 Here are some example snippets to help you get started creating a container.
 
-### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
-
-Compatible with docker-compose v2 schemas.
+### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
 ---
@@ -168,7 +165,7 @@ services:
     restart: unless-stopped
 ```
 
-### docker cli
+### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
 
 ```bash
 docker run -d \
@@ -330,6 +327,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **15.07.21:** - Fix libmaxminddb issue due to upstream change.
+* **07.07.21:** - Rebase to alpine 3.14.
+* **24.06.21:** - Update default nginx conf folder.
+* **28.05.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf - Use `resolver.conf` and patch for `CVE-2021-32637`.
+* **20.05.21:** - Modify resolver.conf generation to detect and ignore ipv6.
 * **14.05.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, ssl.conf, proxy.conf, and the default site-conf - Rework nginx.conf to be inline with alpine upstream and relocate lines from other files. Use linuxserver.io wheel index for pip packages. Switch to using [ffdhe4096](https://ssl-config.mozilla.org/ffdhe4096.txt) for `dhparams.pem` per [RFC7919](https://datatracker.ietf.org/doc/html/rfc7919). Added `worker_processes.conf`, which sets the number of nginx workers, and `resolver.conf`, which sets the dns resolver. Both conf files are auto-generated only on first start and can be user modified later.
 * **21.04.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf and authelia-location.conf - Add remote name/email headers and pass http method.
 * **12.04.21:** - Add php7-gmp and php7-pecl-mailparse.

package_versions.txt

@@ -1,225 +1,227 @@
-alpine-baselayout-3.2.0-r8
-alpine-keys-2.2-r0
-apache2-utils-2.4.46-r3
-apk-tools-2.12.5-r0
+alpine-baselayout-3.2.0-r16
+alpine-keys-2.3-r1
+apache2-utils-2.4.48-r0
+apk-tools-2.12.5-r1
 apr-1.7.0-r0
 apr-util-1.6.1-r7
 argon2-libs-20190702-r1
-bash-5.1.0-r0
-brotli-libs-1.0.9-r3
-busybox-1.32.1-r6
+bash-5.1.4-r0
+brotli-libs-1.0.9-r5
+busybox-1.33.1-r3
 c-client-2007f-r11
 ca-certificates-20191127-r5
 ca-certificates-bundle-20191127-r5
 coreutils-8.32-r2
-curl-7.76.1-r0
-expat-2.2.10-r1
-fail2ban-0.11.1-r4
+curl-7.78.0-r0
+expat-2.4.1-r0
+fail2ban-0.11.2-r0
 freetype-2.10.4-r1
 gdbm-1.19-r0
-git-2.30.2-r0
-git-perl-2.30.2-r0
-glib-2.66.8-r0
+git-2.32.0-r0
+git-perl-2.32.0-r0
+glib-2.68.3-r0
 gmp-6.2.1-r0
 gnupg-2.2.27-r0
 gnutls-3.7.1-r0
 icu-libs-67.1-r2
-ip6tables-1.8.6-r0
-iptables-1.8.6-r0
+ip6tables-1.8.7-r1
+iptables-1.8.7-r1
 libacl-2.2.53-r0
-libassuan-2.5.4-r0
-libattr-2.4.48-r0
-libblkid-2.36.1-r1
-libbsd-0.10.0-r0
+libassuan-2.5.5-r0
+libattr-2.5.1-r0
+libblkid-2.37-r0
+libbsd-0.11.3-r0
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcap-2.46-r0
+libcap-2.50-r0
 libcrypto1.1-1.1.1k-r0
-libcurl-7.76.1-r0
-libedit-20191231.3.1-r1
-libevent-2.1.12-r1
+libcurl-7.78.0-r0
+libedit-20210216.3.1-r0
+libevent-2.1.12-r2
 libffi-3.3-r2
-libgcc-10.2.1_pre1-r3
-libgcrypt-1.8.7-r0
-libgd-2.3.0-r2
-libgpg-error-1.41-r0
+libgcc-10.3.1_git20210424-r2
+libgcrypt-1.9.3-r0
+libgd-2.3.2-r0
+libgpg-error-1.42-r0
 libice-1.0.10-r0
-libidn-1.35-r0
-libintl-0.20.2-r2
+libidn-1.37-r0
+libintl-0.21-r0
 libjpeg-turbo-2.1.0-r0
-libksba-1.5.0-r0
-libldap-2.4.57-r1
-libmagic-5.39-r0
-libmaxminddb-1.5.0-r1
+libksba-1.5.1-r0
+libldap-2.4.58-r0
+libmagic-5.40-r1
+libmaxminddb-1.5.2-r0
 libmcrypt-2.5.8-r9
+libmd-1.0.3-r0
 libmemcached-libs-1.0.18-r4
 libmnl-1.0.4-r1
-libmount-2.36.1-r1
-libnftnl-libs-1.1.8-r0
+libmount-2.37-r0
+libnftnl-libs-1.2.0-r0
 libpng-1.6.37-r1
 libpq-13.3-r0
-libproc-3.3.16-r0
-libressl3.1-libcrypto-3.1.5-r0
-libressl3.1-libssl-3.1.5-r0
-libsasl-2.1.27-r10
-libseccomp-2.5.1-r1
-libsecret-0.20.4-r0
+libproc-3.3.17-r0
+libressl3.3-libcrypto-3.3.3-r0
+libressl3.3-libssl-3.3.3-r0
+libretls-3.3.3-r2
+libsasl-2.1.27-r12
+libseccomp-2.5.1-r2
+libsecret-0.20.4-r1
 libsm-1.2.3-r0
 libsodium-1.0.18-r0
 libssl1.1-1.1.1k-r0
-libstdc++-10.2.1_pre1-r3
-libtasn1-4.16.0-r1
-libtls-standalone-2.9.1-r1
-libunistring-0.9.10-r0
-libuuid-2.36.1-r1
-libwebp-1.1.0-r0
-libx11-1.7.0-r0
+libstdc++-10.3.1_git20210424-r2
+libtasn1-4.17.0-r0
+libunistring-0.9.10-r1
+libuuid-2.37-r0
+libwebp-1.2.0-r2
+libx11-1.7.2-r0
 libxau-1.0.9-r0
-libxcb-1.14-r1
+libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
-libxml2-2.9.10-r6
+libxml2-2.9.12-r1
 libxpm-3.5.13-r0
-libxslt-1.1.34-r0
+libxslt-1.1.34-r1
 libxt-1.2.1-r0
 libzip-1.7.3-r2
-linux-pam-1.5.1-r0
-logrotate-3.18.0-r0
-lz4-libs-1.9.2-r0
+linux-pam-1.5.1-r1
+logrotate-3.18.1-r0
+lz4-libs-1.9.3-r0
 memcached-1.6.9-r0
-musl-1.2.2-r0
-musl-utils-1.2.2-r0
-nano-5.4-r1
-ncurses-libs-6.2_p20210109-r0
-ncurses-terminfo-base-6.2_p20210109-r0
+mpdecimal-2.5.1-r1
+musl-1.2.2-r3
+musl-utils-1.2.2-r3
+nano-5.7-r2
+ncurses-libs-6.2_p20210612-r0
+ncurses-terminfo-base-6.2_p20210612-r0
 nettle-3.7.2-r0
-nghttp2-libs-1.42.0-r1
-nginx-1.18.0-r13
-nginx-mod-devel-kit-1.18.0-r13
-nginx-mod-http-brotli-1.18.0-r13
-nginx-mod-http-dav-ext-1.18.0-r13
-nginx-mod-http-echo-1.18.0-r13
-nginx-mod-http-fancyindex-1.18.0-r13
-nginx-mod-http-geoip2-1.18.0-r13
-nginx-mod-http-headers-more-1.18.0-r13
-nginx-mod-http-image-filter-1.18.0-r13
-nginx-mod-http-nchan-1.18.0-r13
-nginx-mod-http-perl-1.18.0-r13
-nginx-mod-http-redis2-1.18.0-r13
-nginx-mod-http-set-misc-1.18.0-r13
-nginx-mod-http-upload-progress-1.18.0-r13
-nginx-mod-http-xslt-filter-1.18.0-r13
-nginx-mod-mail-1.18.0-r13
-nginx-mod-rtmp-1.18.0-r13
-nginx-mod-stream-1.18.0-r13
-nginx-mod-stream-geoip2-1.18.0-r13
-nginx-vim-1.18.0-r13
+nghttp2-libs-1.43.0-r0
+nginx-1.20.1-r3
+nginx-mod-devel-kit-1.20.1-r3
+nginx-mod-http-brotli-1.20.1-r3
+nginx-mod-http-dav-ext-1.20.1-r3
+nginx-mod-http-echo-1.20.1-r3
+nginx-mod-http-fancyindex-1.20.1-r3
+nginx-mod-http-geoip2-1.20.1-r3
+nginx-mod-http-headers-more-1.20.1-r3
+nginx-mod-http-image-filter-1.20.1-r3
+nginx-mod-http-nchan-1.20.1-r3
+nginx-mod-http-perl-1.20.1-r3
+nginx-mod-http-redis2-1.20.1-r3
+nginx-mod-http-set-misc-1.20.1-r3
+nginx-mod-http-upload-progress-1.20.1-r3
+nginx-mod-http-xslt-filter-1.20.1-r3
+nginx-mod-mail-1.20.1-r3
+nginx-mod-rtmp-1.20.1-r3
+nginx-mod-stream-1.20.1-r3
+nginx-mod-stream-geoip2-1.20.1-r3
+nginx-vim-1.20.1-r3
 npth-1.6-r0
-oniguruma-6.9.6-r0
+oniguruma-6.9.7.1-r0
 openssl-1.1.1k-r0
 p11-kit-0.23.22-r0
 pcre-8.44-r0
 pcre2-10.36-r0
-perl-5.32.0-r0
+perl-5.32.1-r0
 perl-error-0.17029-r1
-perl-git-2.30.2-r0
-php7-7.4.19-r0
-php7-bcmath-7.4.19-r0
-php7-bz2-7.4.19-r0
-php7-common-7.4.19-r0
-php7-ctype-7.4.19-r0
-php7-curl-7.4.19-r0
-php7-dom-7.4.19-r0
-php7-exif-7.4.19-r0
-php7-fileinfo-7.4.19-r0
-php7-fpm-7.4.19-r0
-php7-ftp-7.4.19-r0
-php7-gd-7.4.19-r0
-php7-gmp-7.4.19-r0
-php7-iconv-7.4.19-r0
-php7-imap-7.4.19-r0
-php7-intl-7.4.19-r0
-php7-json-7.4.19-r0
-php7-ldap-7.4.19-r0
-php7-mbstring-7.4.19-r0
-php7-mysqli-7.4.19-r0
-php7-mysqlnd-7.4.19-r0
-php7-opcache-7.4.19-r0
-php7-openssl-7.4.19-r0
-php7-pdo-7.4.19-r0
-php7-pdo_mysql-7.4.19-r0
-php7-pdo_odbc-7.4.19-r0
-php7-pdo_pgsql-7.4.19-r0
-php7-pdo_sqlite-7.4.19-r0
-php7-pear-7.4.19-r0
+perl-git-2.32.0-r0
+php7-7.4.22-r0
+php7-bcmath-7.4.22-r0
+php7-bz2-7.4.22-r0
+php7-common-7.4.22-r0
+php7-ctype-7.4.22-r0
+php7-curl-7.4.22-r0
+php7-dom-7.4.22-r0
+php7-exif-7.4.22-r0
+php7-fileinfo-7.4.21-r0
+php7-fpm-7.4.21-r0
+php7-ftp-7.4.22-r0
+php7-gd-7.4.22-r0
+php7-gmp-7.4.22-r0
+php7-iconv-7.4.22-r0
+php7-imap-7.4.22-r0
+php7-intl-7.4.22-r0
+php7-json-7.4.22-r0
+php7-ldap-7.4.22-r0
+php7-mbstring-7.4.22-r0
+php7-mysqli-7.4.22-r0
+php7-mysqlnd-7.4.22-r0
+php7-opcache-7.4.22-r0
+php7-openssl-7.4.22-r0
+php7-pdo-7.4.22-r0
+php7-pdo_mysql-7.4.22-r0
+php7-pdo_odbc-7.4.22-r0
+php7-pdo_pgsql-7.4.22-r0
+php7-pdo_sqlite-7.4.22-r0
+php7-pear-7.4.22-r0
 php7-pecl-apcu-5.1.20-r0
-php7-pecl-igbinary-3.2.2-r0
+php7-pecl-igbinary-3.2.4-r0
 php7-pecl-mailparse-3.1.1-r1
 php7-pecl-mcrypt-1.0.4-r0
 php7-pecl-memcached-3.1.5-r2
 php7-pecl-redis-5.3.4-r0
-php7-pgsql-7.4.19-r0
-php7-phar-7.4.19-r0
-php7-posix-7.4.19-r0
-php7-session-7.4.19-r0
-php7-simplexml-7.4.19-r0
-php7-soap-7.4.19-r0
-php7-sockets-7.4.19-r0
-php7-sodium-7.4.19-r0
-php7-sqlite3-7.4.19-r0
-php7-tokenizer-7.4.19-r0
-php7-xml-7.4.19-r0
-php7-xmlreader-7.4.19-r0
-php7-xmlrpc-7.4.19-r0
-php7-xmlwriter-7.4.19-r0
-php7-xsl-7.4.19-r0
-php7-zip-7.4.19-r0
+php7-pgsql-7.4.22-r0
+php7-phar-7.4.22-r0
+php7-posix-7.4.22-r0
+php7-session-7.4.22-r0
+php7-simplexml-7.4.21-r0
+php7-soap-7.4.22-r0
+php7-sockets-7.4.22-r0
+php7-sodium-7.4.22-r0
+php7-sqlite3-7.4.22-r0
+php7-tokenizer-7.4.22-r0
+php7-xml-7.4.22-r0
+php7-xmlreader-7.4.22-r0
+php7-xmlrpc-7.4.22-r0
+php7-xmlwriter-7.4.21-r0
+php7-xsl-7.4.22-r0
+php7-zip-7.4.22-r0
 pinentry-1.1.1-r0
 popt-1.18-r0
-procps-3.3.16-r0
-py3-appdirs-1.4.4-r1
-py3-asn1crypto-1.4.0-r0
-py3-cachecontrol-0.12.6-r0
-py3-cffi-1.14.4-r0
-py3-chardet-4.0.0-r0
-py3-colorama-0.4.4-r0
-py3-contextlib2-0.6.0-r0
-py3-cparser-2.20-r0
-py3-cryptography-3.3.2-r0
-py3-distlib-0.3.1-r1
-py3-distro-1.5.0-r1
-py3-future-0.18.2-r1
-py3-html5lib-1.1-r0
-py3-idna-3.1-r0
-py3-lockfile-0.12.2-r3
-py3-msgpack-1.0.2-r0
-py3-ordered-set-4.0.2-r0
-py3-packaging-20.9-r0
-py3-parsing-2.4.7-r1
-py3-pep517-0.9.1-r0
-py3-pip-20.3.4-r0
-py3-progress-1.5-r0
-py3-pytoml-0.1.21-r0
-py3-requests-2.25.1-r1
-py3-retrying-1.3.3-r0
-py3-setuptools-51.3.3-r0
-py3-six-1.15.0-r0
-py3-toml-0.10.2-r0
-py3-urllib3-1.26.2-r1
-py3-webencodings-0.5.1-r3
-python3-3.8.10-r0
+procps-3.3.17-r0
+py3-appdirs-1.4.4-r2
+py3-asn1crypto-1.4.0-r1
+py3-cachecontrol-0.12.6-r1
+py3-certifi-2020.12.5-r1
+py3-cffi-1.14.5-r1
+py3-chardet-4.0.0-r2
+py3-colorama-0.4.4-r1
+py3-contextlib2-0.6.0-r1
+py3-cparser-2.20-r1
+py3-cryptography-3.3.2-r1
+py3-distlib-0.3.1-r3
+py3-distro-1.5.0-r3
+py3-future-0.18.2-r3
+py3-html5lib-1.1-r1
+py3-idna-3.2-r0
+py3-lockfile-0.12.2-r4
+py3-msgpack-1.0.2-r1
+py3-ordered-set-4.0.2-r1
+py3-packaging-20.9-r1
+py3-parsing-2.4.7-r2
+py3-pep517-0.10.0-r2
+py3-pip-20.3.4-r1
+py3-progress-1.5-r2
+py3-requests-2.25.1-r4
+py3-retrying-1.3.3-r1
+py3-setuptools-52.0.0-r3
+py3-six-1.15.0-r1
+py3-toml-0.10.2-r2
+py3-urllib3-1.26.5-r0
+py3-webencodings-0.5.1-r4
+python3-3.9.5-r1
 readline-8.1.0-r0
-s6-ipcserver-2.10.0.0-r0
-scanelf-1.2.8-r0
+s6-ipcserver-2.10.0.3-r0
+scanelf-1.3.2-r0
 shadow-4.8.1-r0
-skalibs-2.10.0.0-r0
-sqlite-libs-3.34.1-r0
-ssl_client-1.32.1-r6
+skalibs-2.10.0.3-r0
+sqlite-libs-3.35.5-r0
+ssl_client-1.33.1-r3
 tzdata-2021a-r0
 unixodbc-2.3.9-r1
-utmps-0.1.0.0-r0
-whois-5.5.7-r1
+utmps-0.1.0.2-r0
+whois-5.5.10-r0
 xz-5.2.5-r0
 xz-libs-5.2.5-r0
 zlib-1.2.11-r3
-zstd-libs-1.4.5-r3
+zstd-libs-1.4.9-r1

readme-vars.yml

@@ -151,6 +151,11 @@ app_setup_nginx_reverse_proxy_block: ""
 
 # changelog
 changelogs:
+  - { date: "15.07.21:", desc: "Fix libmaxminddb issue due to upstream change." }
+  - { date: "07.07.21:", desc: "Rebase to alpine 3.14." }
+  - { date: "24.06.21:", desc: "Update default nginx conf folder." }
+  - { date: "28.05.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf - Use `resolver.conf` and patch for `CVE-2021-32637`." }
+  - { date: "20.05.21:", desc: "Modify resolver.conf generation to detect and ignore ipv6." }
   - { date: "14.05.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf, ssl.conf, proxy.conf, and the default site-conf - Rework nginx.conf to be inline with alpine upstream and relocate lines from other files. Use linuxserver.io wheel index for pip packages. Switch to using [ffdhe4096](https://ssl-config.mozilla.org/ffdhe4096.txt) for `dhparams.pem` per [RFC7919](https://datatracker.ietf.org/doc/html/rfc7919). Added `worker_processes.conf`, which sets the number of nginx workers, and `resolver.conf`, which sets the dns resolver. Both conf files are auto-generated only on first start and can be user modified later." }
   - { date: "21.04.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-server.conf and authelia-location.conf - Add remote name/email headers and pass http method." }
   - { date: "12.04.21:", desc: "Add php7-gmp and php7-pecl-mailparse." }

root/defaults/authelia-server.conf

@@ -1,16 +1,19 @@
-## Version 2021/04/21 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/authelia-server.conf
+## Version 2021/05/28 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/authelia-server.conf
 # Make sure that your authelia container is in the same user defined bridge network and is named authelia
 
 location ^~ /authelia {
     include /config/nginx/proxy.conf;
-    resolver 127.0.0.11 valid=30s;
+    include /config/nginx/resolver.conf;
     set $upstream_authelia authelia;
     proxy_pass http://$upstream_authelia:9091;
 }
 
 location = /authelia/api/verify {
     internal;
-    resolver 127.0.0.11 valid=30s;
+    if ($request_uri ~ [^a-zA-Z0-9_+-=\!@$%&*?~.:#'\;\(\)\[\]]) {
+        return 401;
+    }
+    include /config/nginx/resolver.conf;
     set $upstream_authelia authelia;
     proxy_pass_request_body off;
     proxy_pass http://$upstream_authelia:9091;

root/defaults/default

@@ -41,6 +41,17 @@ server {
     client_max_body_size 0;
 
     location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /ldaplogin;
+
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         try_files $uri $uri/ /index.html /index.php?$args =404;
     }
 
@@ -151,3 +162,5 @@ server {
 
 # enable subdomain method reverse proxy confs
 include /config/nginx/proxy-confs/*.subdomain.conf;
+# enable proxy cache for auth
+proxy_cache_path cache/ keys_zone=auth_cache:10m;

root/defaults/proxy.conf

@@ -15,7 +15,6 @@ proxy_send_timeout 240;
 
 # Proxy Cache and Cookie Settings
 proxy_cache_bypass $cookie_session;
-proxy_cache_path cache/ keys_zone=auth_cache:10m;
 #proxy_cookie_path / "/; Secure"; # enable at your own risk, may break certain apps
 proxy_no_cache $cookie_session;
 

root/etc/cont-init.d/50-config

@@ -81,9 +81,17 @@ cp /config/fail2ban/jail.local /etc/fail2ban/jail.local
 [[ ! -f /config/www/502.html ]] &&
     cp /defaults/502.html /config/www/502.html
 
-# Set resolver
+# Set resolver, ignore ipv6 addresses
 if ! grep -q 'resolver' /config/nginx/resolver.conf; then
-    RESOLVER=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print $2}' /etc/resolv.conf)
+    RESOLVERRAW=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print $2}' /etc/resolv.conf)
+    for i in ${RESOLVERRAW}; do
+        if [ $(awk -F ':' '{print NF-1}' <<< ${i}) -le 2 ]; then
+            RESOLVER="${RESOLVER} ${i}"
+        fi
+    done
+    if [ -z "${RESOLVER}" ]; then
+        RESOLVER="127.0.0.11"
+    fi
     echo "Setting resolver to ${RESOLVER}"
     echo -e "# This file is auto-generated only on first start, based on the container's /etc/resolv.conf file. Feel free to modify it as you wish.\n\nresolver ${RESOLVER} valid=30s;" > /config/nginx/resolver.conf
 fi
@@ -101,6 +109,11 @@ if ! grep -q '#Removed lua' /config/nginx/nginx.conf; then
     sed -i 's|\tlua_load_resty_core off;|\t#Removed lua. Do not remove this comment|g' /config/nginx/nginx.conf
 fi
 
+# patch authelia-server.conf for CVE-2021-32637
+if ! grep -q 'if ($request_uri ~' /config/nginx/authelia-server.conf; then
+    sed -i '/internal;/a \ \ \ \ if ($request_uri ~ [^a-zA-Z0-9_+-=\\!@$%&*?~.:#'\''\\;\\(\\)\\[\\]]) { return 401; }' /config/nginx/authelia-server.conf
+fi
+
 # copy pre-generated dhparams or generate if needed
 [[ ! -f /config/nginx/dhparams.pem ]] && \
     cp /defaults/dhparams.pem /config/nginx/dhparams.pem
@@ -342,7 +355,7 @@ fi
     ln -s /config/geoip2db /var/lib/libmaxminddb
 # check GeoIP2 database
 if [ -n "$MAXMINDDB_LICENSE_KEY" ]; then
-    sed -i "s|.*MAXMINDDB_LICENSE_KEY.*|MAXMINDDB_LICENSE_KEY=\"${MAXMINDDB_LICENSE_KEY}\"|g" /etc/conf.d/libmaxminddb
+    sed -i "s|.*MAXMINDDB_LICENSE_KEY.*|MAXMINDDB_LICENSE_KEY=\"${MAXMINDDB_LICENSE_KEY}\"|g" /etc/libmaxminddb.cron.conf
     if [ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then
         echo "Downloading GeoIP2 City database."
         /etc/periodic/weekly/libmaxminddb