Bot Updating Package Versions

Rebasing to Alpine 3.11

.github/FUNDING.yml

@@ -1 +1,2 @@
+github: linuxserver
 open_collective: linuxserver

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.8
+FROM lsiobase/alpine:3.11
 
 # 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 \
+	libcrypto1.1 \
-	libssl1.0 \
+	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.11
 
 # 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 \
+	libcrypto1.1 \
-	libssl1.0 \
+	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.11
 
 # 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 \
+	libcrypto1.1 \
-	libssl1.0 \
+	libssl1.1 \
 	libusb \
 	pcsc-lite \
 	pcsc-lite-libs && \

Jenkinsfile

@@ -347,7 +347,9 @@ pipeline {
               sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              retry(5) {
                 sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
+              }
               sh '''docker rmi \
                     ${IMAGE}:arm32v7-${META_TAG} \
                     lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -374,7 +376,9 @@ pipeline {
               sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
               sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              retry(5) {
                 sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              }
               sh '''docker rmi \
                     ${IMAGE}:arm64v8-${META_TAG} \
                     lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
@@ -539,6 +543,7 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
+          retry(5) {
             sh '''#! /bin/bash
                   set -e
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -551,6 +556,9 @@ pipeline {
                     docker push ${PUSHIMAGE}:latest
                     docker push ${PUSHIMAGE}:${META_TAG}
                   done
+               '''
+          }
+          sh '''#! /bin/bash
                 for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
                   docker rmi \
                   ${DELETEIMAGE}:${META_TAG} \
@@ -581,6 +589,7 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
+          retry(5) {
             sh '''#! /bin/bash
                   set -e
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -634,6 +643,7 @@ pipeline {
                     docker push ${LEGACYIMAGE}:arm64v8-latest
                   done
                '''
+          }
           sh '''#! /bin/bash
                 for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                   docker rmi \

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)
@@ -102,7 +102,7 @@ Compatible with docker-compose v2 schemas.
 
 ```
 ---
-version: "2"
+version: "2.1"
 services:
   oscam:
     image: linuxserver/oscam
@@ -166,6 +166,11 @@ To set up oscam there are numerous guides on the internet. There are too many sc
 The web interface is at port 8888.
 
 
+## Docker Mods
+[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27oscam%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=oscam "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
 
@@ -231,6 +236,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.12.19:** - Rebasing to alpine 3.11.
+* **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,34 +1,32 @@
-alpine-baselayout-3.1.0-r0
+alpine-baselayout-3.2.0-r3
-alpine-keys-2.1-r1
+alpine-keys-2.1-r2
-apk-tools-2.10.1-r0
+apk-tools-2.10.5-r0
-bash-4.4.19-r1
+bash-5.0.11-r1
-busybox-1.28.4-r3
+busybox-1.31.1-r9
-ca-certificates-20190108-r0
+ca-certificates-20191127-r1
-ccid-1.4.29-r0
+ca-certificates-cacert-20191127-r1
-coreutils-8.29-r2
+ccid-1.4.31-r0
-eudev-libs-3.2.5-r2
+coreutils-8.31-r0
-libacl-2.2.52-r5
+eudev-libs-3.2.9-r1
-libattr-2.4.47-r7
+libacl-2.2.53-r0
-libc-utils-0.7.1-r0
+libattr-2.4.48-r0
-libcrypto1.0-1.0.2t-r0
+libc-utils-0.7.2-r0
-libressl2.7-libcrypto-2.7.5-r0
+libcrypto1.1-1.1.1g-r0
-libressl2.7-libssl-2.7.5-r0
+libssl1.1-1.1.1g-r0
-libressl2.7-libtls-2.7.5-r0
+libtls-standalone-2.9.1-r0
-libssl1.0-1.0.2t-r0
+libusb-1.0.23-r0
-libusb-1.0.22-r0
+linux-pam-1.3.1-r1
-linux-pam-1.3.0-r0
+musl-1.1.24-r2
-musl-1.1.19-r11
+musl-utils-1.1.24-r2
-musl-utils-1.1.19-r11
+ncurses-libs-6.1_p20200118-r4
-ncurses-libs-6.1_p20180818-r1
+ncurses-terminfo-base-6.1_p20200118-r4
-ncurses-terminfo-6.1_p20180818-r1
+pcsc-lite-1.8.25-r2
-ncurses-terminfo-base-6.1_p20180818-r1
+pcsc-lite-libs-1.8.25-r2
-pcsc-lite-1.8.23-r1
+readline-8.0.1-r0
-pcsc-lite-libs-1.8.23-r1
+scanelf-1.2.4-r0
-readline-7.0.003-r0
+shadow-4.7-r1
-scanelf-1.2.3-r0
+ssl_client-1.31.1-r9
-shadow-4.5-r0
+tzdata-2020a-r0
-ssl_client-1.28.4-r3
-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

@@ -73,6 +73,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
+  - { 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." }