Bot Updating Package Versions

Rebasing to Alpine 3.9

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.nginx:3.8
+FROM lsiobase/alpine.nginx:3.9
 
 # set version label
 ARG BUILD_DATE

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.nginx.arm64:3.8
+FROM lsiobase/alpine.nginx.arm64:3.9
 
 # Add qemu to build on x86_64 systems
 COPY qemu-aarch64-static /usr/bin

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.nginx.armhf:3.8
+FROM lsiobase/alpine.nginx.armhf:3.9
 
 # Add qemu to build on x86_64 systems
 COPY qemu-arm-static /usr/bin

Jenkinsfile

@@ -209,6 +209,15 @@ pipeline {
               else
                 echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
               fi
+              mkdir -p ${TEMPDIR}/gitbook
+              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
+              if [ "${BRANCH_NAME}" = "master" ] && [ ! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md ] || [ "$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" ]; then
+                cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
+                cd ${TEMPDIR}/gitbook/docker-documentation/
+                git add images/docker-${CONTAINER_NAME}.md
+                git commit -m 'Bot Updating Templated Files'
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
+              fi
               rm -Rf ${TEMPDIR}'''
         script{
           env.FILES_UPDATED = sh(

README.md

@@ -26,6 +26,8 @@ TLDR: Multi-arch support is changing from multiple repos to one repo per contain
 [![](https://images.microbadger.com/badges/image/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com")
 ![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg)
 ![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg)
+[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-heimdall/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/)
+[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html)
 
 [Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.
 Simplicity is the key to Heimdall.
@@ -37,6 +39,8 @@ Why not use it as your browser start page? It even has the ability to include a
 
 Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). 
 
+Simply pulling `linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+
 The architectures supported by this image are:
 
 | Architecture | Tag |
@@ -45,6 +49,7 @@ The architectures supported by this image are:
 | arm64 | arm64v8-latest |
 | armhf | arm32v6-latest |
 
+
 ## Usage
 
 Here are some example snippets to help you get started creating a container.
@@ -120,6 +125,7 @@ In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as bel
     uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
 ```
 
+
  
 ## Application Setup
 
@@ -141,8 +147,28 @@ This image now supports password protection through htpasswd. Run the following
 * image version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/heimdall`
 
+## Updating Info
+
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.  
+  
+Below are the instructions for updating containers:  
+  
+### Via Docker Run/Create
+* Update the image: `docker pull linuxserver/heimdall`
+* Stop the running container: `docker stop heimdall`
+* Delete the container: `docker rm heimdall`
+* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
+* Start the new container: `docker start heimdall`
+* You can also remove the old dangling images: `docker image prune`
+
+### Via Docker Compose
+* Update the image: `docker-compose pull linuxserver/heimdall`
+* Let compose update containers as necessary: `docker-compose up -d`
+* You can also remove the old dangling images: `docker image prune`
+
 ## Versions
 
+* **22.02.19:** - Rebasing to alpine 3.9.
 * **16.01.18:** - Generate random app key in .env for new installs.
 * **20.11.18:** - Upgrade baseimage packages during build.
 * **04.11.18:** - Add php7-zip.

package_versions.txt

@@ -1,68 +1,69 @@
-musl musl-1.1.19-r10
+musl musl-1.1.20-r3
-busybox busybox-1.28.4-r3
+busybox busybox-1.29.3-r10
-alpine-baselayout alpine-baselayout-3.1.0-r0
+alpine-baselayout alpine-baselayout-3.1.0-r3
 alpine-keys alpine-keys-2.1-r1
-libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0
+libcrypto1.1 libcrypto1.1-1.1.1a-r1
-libressl2.7-libssl libressl2.7-libssl-2.7.4-r0
+libssl1.1 libssl1.1-1.1.1a-r1
-libressl2.7-libtls libressl2.7-libtls-2.7.4-r0
+ca-certificates-cacert ca-certificates-cacert-20190108-r0
-ssl_client ssl_client-1.28.4-r3
+libtls-standalone libtls-standalone-2.7.4-r6
+ssl_client ssl_client-1.29.3-r10
 zlib zlib-1.2.11-r1
-apk-tools apk-tools-2.10.1-r0
+apk-tools apk-tools-2.10.3-r1
 scanelf scanelf-1.2.3-r0
-musl-utils musl-utils-1.1.19-r10
+musl-utils musl-utils-1.1.20-r3
 libc-utils libc-utils-0.7.1-r0
 xz-libs xz-libs-5.2.4-r0
 xz xz-5.2.4-r0
-ca-certificates ca-certificates-20171114-r3
+ca-certificates ca-certificates-20190108-r0
-ncurses-terminfo-base ncurses-terminfo-base-6.1_p20180818-r1
+ncurses-terminfo-base ncurses-terminfo-base-6.1_p20190105-r0
-ncurses-terminfo ncurses-terminfo-6.1_p20180818-r1
+ncurses-terminfo ncurses-terminfo-6.1_p20190105-r0
-ncurses-libs ncurses-libs-6.1_p20180818-r1
+ncurses-libs ncurses-libs-6.1_p20190105-r0
-readline readline-7.0.003-r0
+readline readline-7.0.003-r1
 bash bash-4.4.19-r1
 libattr libattr-2.4.47-r7
 libacl libacl-2.2.52-r5
-coreutils coreutils-8.29-r2
+coreutils coreutils-8.30-r0
 linux-pam linux-pam-1.3.0-r0
 shadow shadow-4.5-r0
-tzdata tzdata-2018f-r0
+tzdata tzdata-2018i-r0
-libuuid libuuid-2.32-r0
+libuuid libuuid-2.33-r0
-apr apr-1.6.3-r1
+apr apr-1.6.5-r0
-expat expat-2.2.5-r0
+expat expat-2.2.6-r0
-apr-util apr-util-1.6.1-r3
+apr-util apr-util-1.6.1-r5
-apache2-utils apache2-utils-2.4.38-r1
+apache2-utils apache2-utils-2.4.38-r2
-nghttp2-libs nghttp2-libs-1.32.0-r0
+nghttp2-libs nghttp2-libs-1.35.1-r0
-libssh2 libssh2-1.8.0-r3
+libssh2 libssh2-1.8.0-r4
-libcurl libcurl-7.61.1-r1
+libcurl libcurl-7.63.0-r0
-pcre2 pcre2-10.31-r0
+pcre2 pcre2-10.32-r1
-git git-2.18.1-r0
+git git-2.20.1-r0
+libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r2
+libressl2.7-libssl libressl2.7-libssl-2.7.4-r2
 popt popt-1.16-r7
-logrotate logrotate-3.14.0-r0
+logrotate logrotate-3.15.0-r0
-libmagic libmagic-5.32-r0
+libmagic libmagic-5.35-r0
-nano nano-2.9.8-r0
+nano nano-3.2-r0
-pcre pcre-8.42-r0
+pcre pcre-8.42-r1
 nginx nginx-1.14.2-r0
-libcrypto1.0 libcrypto1.0-1.0.2q-r0
+openssl openssl-1.1.1a-r1
-libssl1.0 libssl1.0-1.0.2q-r0
+php7-common php7-common-7.2.14-r0
-openssl openssl-1.0.2q-r0
+libedit libedit-20181209.3.1-r0
-php7-common php7-common-7.2.13-r0
+libxml2 libxml2-2.9.9-r0
-libedit libedit-20170329.3.1-r3
+php7 php7-7.2.14-r0
-libxml2 libxml2-2.9.8-r1
+php7-fileinfo php7-fileinfo-7.2.14-r0
-php7 php7-7.2.13-r0
+php7-fpm php7-fpm-7.2.14-r0
-php7-fileinfo php7-fileinfo-7.2.13-r0
+php7-json php7-json-7.2.14-r0
-php7-fpm php7-fpm-7.2.13-r0
+php7-mbstring php7-mbstring-7.2.14-r0
-php7-json php7-json-7.2.13-r0
+php7-openssl php7-openssl-7.2.14-r0
-php7-mbstring php7-mbstring-7.2.13-r0
+php7-session php7-session-7.2.14-r0
-php7-openssl php7-openssl-7.2.13-r0
+php7-simplexml php7-simplexml-7.2.14-r0
-php7-session php7-session-7.2.13-r0
+php7-xml php7-xml-7.2.14-r0
-php7-simplexml php7-simplexml-7.2.13-r0
+php7-xmlwriter php7-xmlwriter-7.2.14-r0
-php7-xml php7-xml-7.2.13-r0
+curl curl-7.63.0-r0
-php7-xmlwriter php7-xmlwriter-7.2.13-r0
+php7-ctype php7-ctype-7.2.14-r0
-curl curl-7.61.1-r1
+php7-pdo php7-pdo-7.2.14-r0
-php7-ctype php7-ctype-7.2.13-r0
+sqlite-libs sqlite-libs-3.26.0-r3
-php7-pdo php7-pdo-7.2.13-r0
+php7-pdo_sqlite php7-pdo_sqlite-7.2.14-r0
-sqlite-libs sqlite-libs-3.25.3-r0
+php7-tokenizer php7-tokenizer-7.2.14-r0
-php7-pdo_sqlite php7-pdo_sqlite-7.2.13-r0
+libzip libzip-1.5.1-r2
-php7-tokenizer php7-tokenizer-7.2.13-r0
+php7-zip php7-zip-7.2.14-r0
-libzip libzip-1.5.1-r1
-php7-zip php7-zip-7.2.13-r0
 tar tar-1.31-r0

readme-vars.yml

@@ -52,6 +52,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
   - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." }
   - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." }
   - { date: "04.11.18:", desc: "Add php7-zip." }