Bot Updating Package Versions

Rebasing to Alpine 3.11

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/nginx:3.10
+FROM lsiobase/nginx:3.11
 
 # set version label
 ARG BUILD_DATE
@@ -14,7 +14,6 @@ RUN \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
 	curl \
-	nginx \
 	php7-ctype \
 	php7-pdo_pgsql \
 	php7-pdo_sqlite \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM lsiobase/nginx:arm64v8-3.10
+FROM lsiobase/nginx:arm64v8-3.11
 
 # set version label
 ARG BUILD_DATE
@@ -14,7 +14,6 @@ RUN \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
 	curl \
-	nginx \
 	php7-ctype \
 	php7-pdo_pgsql \
 	php7-pdo_sqlite \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM lsiobase/nginx:arm32v7-3.10
+FROM lsiobase/nginx:arm32v7-3.11
 
 # set version label
 ARG BUILD_DATE
@@ -14,7 +14,6 @@ RUN \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
 	curl \
-	nginx \
 	php7-ctype \
 	php7-pdo_pgsql \
 	php7-pdo_sqlite \

Jenkinsfile

@@ -627,7 +627,7 @@ pipeline {
                   docker manifest push --purge ${MANIFESTIMAGE}:latest
                   docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                 done
-                for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; do
+                for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
                   docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
                   docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
                   docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
@@ -741,12 +741,12 @@ pipeline {
           sh 'echo "build aborted"'
         }
         else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
         else {
-          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }

README.md

@@ -5,10 +5,9 @@
 [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
 [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
 [![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.")
-[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
 [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
 
-The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
+The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
 
  * regular and timely application updates
  * easy user mappings (PGID, PUID)
@@ -22,7 +21,6 @@ Find us at:
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
 * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
 * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
-* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
 * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
 
 # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall)
@@ -93,7 +91,7 @@ Compatible with docker-compose v2 schemas.
 
 ```
 ---
-version: "2"
+version: "2.1"
 services:
   heimdall:
     image: linuxserver/heimdall
@@ -123,6 +121,18 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
 | `-v /config` | Contains all relevant configuration files. |
 
+## Environment variables from files (Docker secrets)
+
+You can set any environment variable from a file by using a special prepend `FILE__`. 
+
+As an example:
+
+```
+-e FILE__PASSWORD=/run/secrets/mysecretpassword
+```
+
+Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+
 ## User / Group Identifiers
 
 When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
@@ -148,6 +158,11 @@ Access the web gui at http://SERVERIP:PORT
 This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default` and restart the container after updating the image. A new site config with htpasswd support will be created in its place.
 
 
+## Docker Mods
+[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27heimdall%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=heimdall "view available mods for this container.")
+
+We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
+
 
 ## Support Info
 
@@ -213,6 +228,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **17.01.20:** - Use nginx from baseimage.
+* **19.12.19:** - Rebasing to alpine 3.11.
 * **16.07.19:** - Save laravel.log to /config/log/heimdall.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **01.04.19:** - Fix permission detect logic.

package_versions.txt

@@ -1,74 +1,73 @@
-alpine-baselayout-3.1.2-r0
+alpine-baselayout-3.2.0-r3
 alpine-keys-2.1-r2
-apache2-utils-2.4.41-r0
+apache2-utils-2.4.43-r0
-apk-tools-2.10.4-r2
+apk-tools-2.10.5-r0
-apr-1.6.5-r0
+apr-1.7.0-r0
 apr-util-1.6.1-r6
-argon2-libs-20171227-r2
+argon2-libs-20190702-r1
-bash-5.0.0-r0
+bash-5.0.11-r1
-busybox-1.30.1-r3
+busybox-1.31.1-r9
-ca-certificates-20190108-r0
+ca-certificates-20191127-r1
-ca-certificates-cacert-20190108-r0
+ca-certificates-cacert-20191127-r1
 coreutils-8.31-r0
-curl-7.66.0-r0
+curl-7.67.0-r0
 db-5.3.28-r1
-expat-2.2.8-r0
+expat-2.2.9-r1
-git-2.22.0-r0
+git-2.24.2-r0
-libacl-2.2.52-r6
+libacl-2.2.53-r0
 libattr-2.4.48-r0
-libc-utils-0.7.1-r0
+libc-utils-0.7.2-r0
-libcrypto1.1-1.1.1d-r0
+libcrypto1.1-1.1.1d-r3
-libcurl-7.66.0-r0
+libcurl-7.67.0-r0
-libedit-20190324.3.1-r0
+libedit-20191211.3.1-r0
-libldap-2.4.48-r0
+libldap-2.4.48-r1
 libmagic-5.37-r1
-libpq-11.5-r1
+libpq-12.2-r0
-libressl2.7-libcrypto-2.7.5-r0
+libressl3.0-libcrypto-3.0.2-r0
-libressl2.7-libssl-2.7.5-r0
+libressl3.0-libssl-3.0.2-r0
-libsasl-2.1.27-r3
+libsasl-2.1.27-r5
-libssl1.1-1.1.1d-r0
+libssl1.1-1.1.1d-r3
 libtls-standalone-2.9.1-r0
-libuuid-2.33.2-r0
+libuuid-2.34-r1
-libxml2-2.9.9-r2
+libxml2-2.9.10-r2
 libzip-1.5.2-r0
-linux-pam-1.3.0-r1
+linux-pam-1.3.1-r1
-logrotate-3.15.0-r0
+logrotate-3.15.1-r0
-musl-1.1.22-r3
+musl-1.1.24-r2
-musl-utils-1.1.22-r3
+musl-utils-1.1.24-r2
-nano-4.3-r0
+nano-4.6-r0
-ncurses-libs-6.1_p20190518-r0
+ncurses-libs-6.1_p20200118-r2
-ncurses-terminfo-6.1_p20190518-r0
+ncurses-terminfo-base-6.1_p20200118-r2
-ncurses-terminfo-base-6.1_p20190518-r0
+nghttp2-libs-1.40.0-r0
-nghttp2-libs-1.39.2-r0
+nginx-1.16.1-r6
-nginx-1.16.1-r1
+openssl-1.1.1d-r3
-openssl-1.1.1d-r0
 pcre-8.43-r0
-pcre2-10.33-r0
+pcre2-10.34-r1
-php7-7.3.11-r0
+php7-7.3.16-r0
-php7-common-7.3.11-r0
+php7-common-7.3.17-r0
-php7-ctype-7.3.11-r0
+php7-ctype-7.3.17-r0
-php7-fileinfo-7.3.11-r0
+php7-fileinfo-7.3.16-r0
-php7-fpm-7.3.11-r0
+php7-fpm-7.3.16-r0
-php7-json-7.3.11-r0
+php7-json-7.3.16-r0
-php7-mbstring-7.3.11-r0
+php7-mbstring-7.3.16-r0
-php7-openssl-7.3.11-r0
+php7-openssl-7.3.16-r0
-php7-pdo-7.3.11-r0
+php7-pdo-7.3.17-r0
-php7-pdo_pgsql-7.3.11-r0
+php7-pdo_pgsql-7.3.17-r0
-php7-pdo_sqlite-7.3.11-r0
+php7-pdo_sqlite-7.3.17-r0
-php7-session-7.3.11-r0
+php7-session-7.3.16-r0
-php7-simplexml-7.3.11-r0
+php7-simplexml-7.3.16-r0
-php7-tokenizer-7.3.11-r0
+php7-tokenizer-7.3.17-r0
-php7-xml-7.3.11-r0
+php7-xml-7.3.16-r0
-php7-xmlwriter-7.3.11-r0
+php7-xmlwriter-7.3.16-r0
-php7-zip-7.3.11-r0
+php7-zip-7.3.17-r0
 popt-1.16-r7
-readline-8.0.0-r0
+readline-8.0.1-r0
-scanelf-1.2.3-r0
+scanelf-1.2.4-r0
-shadow-4.6-r2
+shadow-4.7-r1
-sqlite-libs-3.28.0-r1
+sqlite-libs-3.30.1-r1
-ssl_client-1.30.1-r3
+ssl_client-1.31.1-r9
-tar-1.32-r0
+tar-1.32-r1
 tzdata-2019c-r0
 xz-5.2.4-r0
 xz-libs-5.2.4-r0
-zlib-1.2.11-r1
+zlib-1.2.11-r3

readme-vars.yml

@@ -49,6 +49,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "17.01.20:", desc: "Use nginx from baseimage." }
+  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
   - { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "01.04.19:", desc: "Fix permission detect logic." }