1
0

Merge pull request #20 from linuxserver/master-3.10

rebase to Alpine 3.10
This commit is contained in:
saarg
2019-12-17 23:21:28 +01:00
committed by GitHub
4 changed files with 13 additions and 12 deletions

View File

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

View File

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

View File

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

View File

@ -73,6 +73,7 @@ app_setup_block: |
# changelog # changelog
changelogs: 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: "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: "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." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }