Merge branch 'master' into py3

Author: aptalca

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.10
+FROM lsiobase/alpine:3.11
 
 # set version label
 ARG BUILD_DATE

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:arm64v8-3.10
+FROM lsiobase/alpine:arm64v8-3.11
 
 # set version label
 ARG BUILD_DATE

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:arm32v7-3.10
+FROM lsiobase/alpine:arm32v7-3.11
 
 # set version label
 ARG BUILD_DATE

Jenkinsfile

@@ -618,7 +618,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}
@@ -732,12 +732,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,7 +5,6 @@
 [![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 :-
@@ -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/ldap-auth](https://github.com/linuxserver/docker-ldap-auth)
@@ -103,6 +101,18 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-p 9000` | the port for ldap login page |
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
 
+## 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.
+
 
  
 ## Application Setup
@@ -176,7 +186,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **21.11.19:** - Switch to python3.
+* **20.02.20:** - Switch to python3.
+* **19.12.19:** - Rebasing to alpine 3.11.
 * **01.07.19:** - Fall back to base64 encoding when basic http auth is used.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.

package_versions.txt

@@ -1,39 +1,39 @@
-alpine-baselayout-3.1.2-r0
+alpine-baselayout-3.2.0-r3
 alpine-keys-2.1-r2
-apk-tools-2.10.4-r2
-bash-5.0.0-r0
-busybox-1.30.1-r3
-ca-certificates-20190108-r0
-ca-certificates-cacert-20190108-r0
+apk-tools-2.10.4-r3
+bash-5.0.11-r1
+busybox-1.31.1-r9
+ca-certificates-20191127-r1
+ca-certificates-cacert-20191127-r1
 coreutils-8.31-r0
 db-5.3.28-r1
-expat-2.2.8-r0
+expat-2.2.9-r1
 gdbm-1.13-r1
-libacl-2.2.52-r6
+libacl-2.2.53-r0
 libattr-2.4.48-r0
-libbz2-1.0.6-r7
-libc-utils-0.7.1-r0
-libcrypto1.1-1.1.1d-r0
+libbz2-1.0.8-r1
+libc-utils-0.7.2-r0
+libcrypto1.1-1.1.1d-r3
 libffi-3.2.1-r6
-libldap-2.4.48-r0
-libsasl-2.1.27-r3
-libssl1.1-1.1.1d-r0
+libldap-2.4.48-r1
+libsasl-2.1.27-r5
+libssl1.1-1.1.1d-r3
 libtls-standalone-2.9.1-r0
-linux-pam-1.3.0-r1
-musl-1.1.22-r3
-musl-utils-1.1.22-r3
-ncurses-libs-6.1_p20190518-r0
-ncurses-terminfo-6.1_p20190518-r0
-ncurses-terminfo-base-6.1_p20190518-r0
-py-setuptools-40.8.0-r1
+linux-pam-1.3.1-r1
+musl-1.1.24-r0
+musl-utils-1.1.24-r0
+ncurses-libs-6.1_p20191130-r0
+ncurses-terminfo-6.1_p20191130-r0
+ncurses-terminfo-base-6.1_p20191130-r0
+py-setuptools-42.0.2-r0
 py2-pip-18.1-r0
-python2-2.7.16-r1
-readline-8.0.0-r0
-scanelf-1.2.3-r0
-shadow-4.6-r2
-sqlite-libs-3.28.0-r1
-ssl_client-1.30.1-r3
+python2-2.7.16-r3
+readline-8.0.1-r0
+scanelf-1.2.4-r0
+shadow-4.7-r1
+sqlite-libs-3.30.1-r1
+ssl_client-1.31.1-r9
 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

@@ -34,7 +34,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "21.11.19:", desc: "Switch to python3." }
+  - { date: "20.02.20:", desc: "Switch to python3." }
+  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
   - { date: "01.07.19:", desc: "Fall back to base64 encoding when basic http auth is used." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }