From 7cf6a4290e8e1386c3ad80a64683363ca4d6ff4c Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 28 Jun 2019 19:08:29 -0700 Subject: [PATCH] Rebasing to Alpine 3.10 --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- readme-vars.yml | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d252cbd..8b8ad6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:3.9 as buildstage +FROM lsiobase/alpine:3.10 as buildstage ############## build stage ############## # package versions @@ -215,7 +215,7 @@ RUN \ make DESTDIR=/tmp/comskip-build install ############## runtime stage ############## -FROM lsiobase/alpine:3.9 +FROM lsiobase/alpine:3.10 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7ba6207..7d8ab5c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm64v8-3.9 as buildstage +FROM lsiobase/alpine:arm64v8-3.10 as buildstage ############## build stage ############## # package versions @@ -215,7 +215,7 @@ RUN \ make DESTDIR=/tmp/comskip-build install ############## runtime stage ############## -FROM lsiobase/alpine:arm64v8-3.9 +FROM lsiobase/alpine:arm64v8-3.10 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1152c7e..884648f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm32v7-3.9 as buildstage +FROM lsiobase/alpine:arm32v7-3.10 as buildstage ############## build stage ############## # package versions @@ -215,7 +215,7 @@ RUN \ make DESTDIR=/tmp/comskip-build install ############## runtime stage ############## -FROM lsiobase/alpine:arm32v7-3.9 +FROM lsiobase/alpine:arm32v7-3.10 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index 9864585..f443721 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -125,6 +125,7 @@ app_setup_block: | # changelog changelogs: + - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "27.03.19:", desc: "Rebase to Alpine 3.9, fix init logic to only chown once." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "17.02.19:", desc: "Bump xmltv to 5.70, ensure version tagging works by cloning tvheadend." }