Bot Updating Package Versions

Dockerfile

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

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

@@ -14,7 +14,6 @@ RUN \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
 	curl \
-	nginx \
 	php7-ctype \
 	php7-pdo_pgsql \
 	php7-pdo_sqlite \

README.md

@@ -7,7 +7,7 @@
 [![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.")
 [![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)
@@ -91,7 +91,7 @@ Compatible with docker-compose v2 schemas.
 
 ```
 ---
-version: "2"
+version: "2.1"
 services:
   heimdall:
     image: linuxserver/heimdall
@@ -158,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
 
@@ -223,6 +228,7 @@ 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.

package_versions.txt

@@ -1,72 +1,71 @@
 alpine-baselayout-3.2.0-r3
 alpine-keys-2.1-r2
-apache2-utils-2.4.41-r0
-apk-tools-2.10.4-r3
+apache2-utils-2.4.43-r0
+apk-tools-2.10.5-r0
 apr-1.7.0-r0
 apr-util-1.6.1-r6
 argon2-libs-20190702-r1
 bash-5.0.11-r1
-busybox-1.31.1-r8
-ca-certificates-20191127-r0
-ca-certificates-cacert-20191127-r0
+busybox-1.31.1-r9
+ca-certificates-20191127-r1
+ca-certificates-cacert-20191127-r1
 coreutils-8.31-r0
 curl-7.67.0-r0
 db-5.3.28-r1
 expat-2.2.9-r1
-git-2.24.1-r0
+git-2.24.3-r0
 libacl-2.2.53-r0
 libattr-2.4.48-r0
 libc-utils-0.7.2-r0
-libcrypto1.1-1.1.1d-r3
+libcrypto1.1-1.1.1g-r0
 libcurl-7.67.0-r0
 libedit-20191211.3.1-r0
 libldap-2.4.48-r1
 libmagic-5.37-r1
-libpq-12.1-r0
+libpq-12.2-r0
 libressl3.0-libcrypto-3.0.2-r0
 libressl3.0-libssl-3.0.2-r0
 libsasl-2.1.27-r5
-libssl1.1-1.1.1d-r3
+libssl1.1-1.1.1g-r0
 libtls-standalone-2.9.1-r0
 libuuid-2.34-r1
-libxml2-2.9.10-r1
+libxml2-2.9.10-r2
 libzip-1.5.2-r0
 linux-pam-1.3.1-r1
 logrotate-3.15.1-r0
-musl-1.1.24-r0
-musl-utils-1.1.24-r0
+musl-1.1.24-r2
+musl-utils-1.1.24-r2
 nano-4.6-r0
-ncurses-libs-6.1_p20191130-r0
-ncurses-terminfo-6.1_p20191130-r0
-ncurses-terminfo-base-6.1_p20191130-r0
+ncurses-libs-6.1_p20200118-r3
+ncurses-terminfo-base-6.1_p20200118-r3
 nghttp2-libs-1.40.0-r0
-nginx-1.16.1-r4
-openssl-1.1.1d-r2
+nginx-1.16.1-r6
+openssl-1.1.1g-r0
 pcre-8.43-r0
 pcre2-10.34-r1
-php7-7.3.13-r0
-php7-common-7.3.13-r0
-php7-ctype-7.3.13-r0
-php7-fileinfo-7.3.13-r0
-php7-fpm-7.3.13-r0
-php7-json-7.3.13-r0
-php7-mbstring-7.3.13-r0
-php7-openssl-7.3.13-r0
-php7-pdo-7.3.13-r0
-php7-pdo_pgsql-7.3.13-r0
-php7-pdo_sqlite-7.3.13-r0
-php7-session-7.3.13-r0
-php7-simplexml-7.3.13-r0
-php7-tokenizer-7.3.13-r0
-php7-xml-7.3.13-r0
-php7-xmlwriter-7.3.13-r0
-php7-zip-7.3.13-r0
+php7-7.3.17-r0
+php7-common-7.3.17-r0
+php7-ctype-7.3.17-r0
+php7-fileinfo-7.3.17-r0
+php7-fpm-7.3.17-r0
+php7-json-7.3.17-r0
+php7-mbstring-7.3.17-r0
+php7-openssl-7.3.17-r0
+php7-pdo-7.3.17-r0
+php7-pdo_pgsql-7.3.17-r0
+php7-pdo_sqlite-7.3.17-r0
+php7-session-7.3.17-r0
+php7-simplexml-7.3.17-r0
+php7-tokenizer-7.3.17-r0
+php7-xml-7.3.17-r0
+php7-xmlwriter-7.3.17-r0
+php7-zip-7.3.17-r0
 popt-1.16-r7
 readline-8.0.1-r0
 scanelf-1.2.4-r0
-shadow-4.7-r0
+shadow-4.7-r1
 sqlite-libs-3.30.1-r1
-ssl_client-1.31.1-r8
+ssl_client-1.31.1-r9
 tar-1.32-r1
 tzdata-2019c-r0
 xz-5.2.4-r0

readme-vars.yml

@@ -49,6 +49,7 @@ 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." }