From 63f592150df4d7b230b6ebe85df88c20613fd9d6 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 29 Jun 2019 09:17:53 -0700 Subject: [PATCH 1/2] rebasing to alpine 3.10 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47c8f5b..989d516 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG ALPINE_VER="3.9" +ARG ALPINE_VER="3.10" FROM lsiobase/alpine:${ALPINE_VER} as fetch-stage ############## fetch stage ############## diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6335016..dac352b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -ARG ALPINE_VER="3.9" +ARG ALPINE_VER="3.10" FROM lsiobase/alpine:arm64v8-${ALPINE_VER} as fetch-stage ############## fetch stage ############## diff --git a/Dockerfile.armhf b/Dockerfile.armhf index fe6ed2d..805e980 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -ARG ALPINE_VER="3.9" +ARG ALPINE_VER="3.10" FROM lsiobase/alpine:arm32v7-${ALPINE_VER} as fetch-stage ############## fetch stage ############## diff --git a/readme-vars.yml b/readme-vars.yml index e1c0c18..7545b86 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -33,6 +33,7 @@ param_ports: # changelog changelogs: + - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "01.03.19:", desc: "Switch to python3." } - { date: "07.02.19:", desc: "Add fftw-dev build dependency for chromaprint." } From d4ed739f8403bc397f90d2e4f2fec3a84a473024 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 29 Jun 2019 12:47:15 -0700 Subject: [PATCH 2/2] 3.10 runs python 3.7, updating pathing --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 989d516..30fb300 100644 --- a/Dockerfile +++ b/Dockerfile @@ -160,7 +160,7 @@ FROM lsiobase/alpine:${ALPINE_VER} as strip-stage COPY --from=beets_build-stage /build/beets/usr/ /build/all//usr/ COPY --from=chromaprint_build-stage /build/chromaprint/usr/ /build/all//usr/ COPY --from=mp3gain_build-stage /build/mp3gain/usr/ /build/all//usr/ -COPY --from=pip-stage /usr/lib/python3.6/site-packages /build/all/usr/lib/python3.6/site-packages +COPY --from=pip-stage /usr/lib/python3.7/site-packages /build/all/usr/lib/python3.7/site-packages # install strip packages RUN \ @@ -174,7 +174,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # strip packages RUN \ set -ex && \ - for dirs in usr/bin usr/lib usr/lib/python3.6/site-packages; \ + for dirs in usr/bin usr/lib usr/lib/python3.7/site-packages; \ do \ find /build/all/"${dirs}" -type f | \ while read -r files ; do strip "${files}" || true \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index dac352b..d7c44f7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -164,7 +164,7 @@ FROM lsiobase/alpine:arm64v8-${ALPINE_VER} as strip-stage COPY --from=beets_build-stage /build/beets/usr/ /build/all//usr/ COPY --from=chromaprint_build-stage /build/chromaprint/usr/ /build/all//usr/ COPY --from=mp3gain_build-stage /build/mp3gain/usr/ /build/all//usr/ -COPY --from=pip-stage /usr/lib/python3.6/site-packages /build/all/usr/lib/python3.6/site-packages +COPY --from=pip-stage /usr/lib/python3.7/site-packages /build/all/usr/lib/python3.7/site-packages # install strip packages RUN \ @@ -178,7 +178,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # strip packages RUN \ set -ex && \ - for dirs in usr/bin usr/lib usr/lib/python3.6/site-packages; \ + for dirs in usr/bin usr/lib usr/lib/python3.7/site-packages; \ do \ find /build/all/"${dirs}" -type f | \ while read -r files ; do strip "${files}" || true \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 805e980..201fc53 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -160,7 +160,7 @@ FROM lsiobase/alpine:arm32v7-${ALPINE_VER} as strip-stage COPY --from=beets_build-stage /build/beets/usr/ /build/all//usr/ COPY --from=chromaprint_build-stage /build/chromaprint/usr/ /build/all//usr/ COPY --from=mp3gain_build-stage /build/mp3gain/usr/ /build/all//usr/ -COPY --from=pip-stage /usr/lib/python3.6/site-packages /build/all/usr/lib/python3.6/site-packages +COPY --from=pip-stage /usr/lib/python3.7/site-packages /build/all/usr/lib/python3.7/site-packages # install strip packages RUN \ @@ -174,7 +174,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # strip packages RUN \ set -ex && \ - for dirs in usr/bin usr/lib usr/lib/python3.6/site-packages; \ + for dirs in usr/bin usr/lib usr/lib/python3.7/site-packages; \ do \ find /build/all/"${dirs}" -type f | \ while read -r files ; do strip "${files}" || true \