diff --git a/Dockerfile b/Dockerfile index 62e9f67..f92cebc 100644 --- a/Dockerfile +++ b/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 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f63e275..5918d1c 100644 --- a/Dockerfile.aarch64 +++ b/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 && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 90f4712..4e9d562 100644 --- a/Dockerfile.armhf +++ b/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 && \ diff --git a/readme-vars.yml b/readme-vars.yml index f51609b..32c92e5 100644 --- a/readme-vars.yml +++ b/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." }