Bot Updating Package Versions

rebase to Alpine 3.10

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.8
+FROM lsiobase/alpine:3.10
 
 # set version label
 ARG BUILD_DATE
@@ -17,15 +17,15 @@ RUN \
 	libusb-dev \
 	linux-headers \
 	make \
-	libressl-dev \
+	openssl-dev \
 	pcsc-lite-dev \
 	subversion \
 	tar && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	ccid \
-	libcrypto1.0 \
-	libssl1.0 \
+	libcrypto1.1 \
+	libssl1.1 \
 	libusb \
 	pcsc-lite \
 	pcsc-lite-libs && \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:arm64v8-3.8
+FROM lsiobase/alpine:arm64v8-3.10
 
 # set version label
 ARG BUILD_DATE
@@ -17,15 +17,15 @@ RUN \
 	libusb-dev \
 	linux-headers \
 	make \
-	libressl-dev \
+	openssl-dev \
 	pcsc-lite-dev \
 	subversion \
 	tar && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	ccid \
-	libcrypto1.0 \
-	libssl1.0 \
+	libcrypto1.1 \
+	libssl1.1 \
 	libusb \
 	pcsc-lite \
 	pcsc-lite-libs && \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:arm32v7-3.8
+FROM lsiobase/alpine:arm32v7-3.10
 
 # set version label
 ARG BUILD_DATE
@@ -17,15 +17,15 @@ RUN \
 	libusb-dev \
 	linux-headers \
 	make \
-	libressl-dev \
+	openssl-dev \
 	pcsc-lite-dev \
 	subversion \
 	tar && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	ccid \
-	libcrypto1.0 \
-	libssl1.0 \
+	libcrypto1.1 \
+	libssl1.1 \
 	libusb \
 	pcsc-lite \
 	pcsc-lite-libs && \

Jenkinsfile

@@ -617,7 +617,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}
@@ -731,12 +731,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/oscam](https://github.com/linuxserver/docker-oscam)
@@ -135,6 +133,18 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-v /config` | Where oscam should store config files and logs. |
 | `--device /dev/ttyUSB0` | For passing through smart card readers. |
 
+## 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`.
@@ -221,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.06.19:** - Rebasing to alpine 3.10.
 * **29.04.19:** - Add revision check, so pipeline can build new revisions.
 * **28.04.19:** - Switch back to streamboard svn to fix version not showing in UI.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.

package_versions.txt

@@ -1,33 +1,32 @@
-alpine-baselayout-3.1.0-r0
-alpine-keys-2.1-r1
-apk-tools-2.10.1-r0
-bash-4.4.19-r1
-busybox-1.28.4-r3
+alpine-baselayout-3.1.2-r0
+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
-ccid-1.4.29-r0
-coreutils-8.29-r2
-eudev-libs-3.2.5-r2
-libacl-2.2.52-r5
-libattr-2.4.47-r7
+ca-certificates-cacert-20190108-r0
+ccid-1.4.30-r0
+coreutils-8.31-r0
+eudev-libs-3.2.8-r0
+libacl-2.2.52-r6
+libattr-2.4.48-r0
 libc-utils-0.7.1-r0
-libcrypto1.0-1.0.2t-r0
-libressl2.7-libcrypto-2.7.5-r0
-libressl2.7-libssl-2.7.5-r0
-libressl2.7-libtls-2.7.5-r0
-libssl1.0-1.0.2t-r0
+libcrypto1.1-1.1.1d-r0
+libssl1.1-1.1.1d-r0
+libtls-standalone-2.9.1-r0
 libusb-1.0.22-r0
-linux-pam-1.3.0-r0
-musl-1.1.19-r11
-musl-utils-1.1.19-r11
-ncurses-libs-6.1_p20180818-r1
-ncurses-terminfo-6.1_p20180818-r1
-ncurses-terminfo-base-6.1_p20180818-r1
-pcsc-lite-1.8.23-r1
-pcsc-lite-libs-1.8.23-r1
-readline-7.0.003-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
+pcsc-lite-1.8.25-r1
+pcsc-lite-libs-1.8.25-r1
+readline-8.0.0-r0
 scanelf-1.2.3-r0
-shadow-4.5-r0
-ssl_client-1.28.4-r3
+shadow-4.6-r2
+ssl_client-1.30.1-r3
 tzdata-2019c-r0
 xz-5.2.4-r0
 xz-libs-5.2.4-r0

readme-vars.yml

@@ -73,6 +73,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "29.04.19:", desc: "Add revision check, so pipeline can build new revisions." }
   - { date: "28.04.19:", desc: "Switch back to streamboard svn to fix version not showing in UI." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }