From 9131b0799c6498444e4a0224f6a1af63216b04ed Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 28 Jun 2019 20:46:49 -0700 Subject: [PATCH 1/2] rebasing to 3.10 --- Dockerfile | 6 ++++-- Dockerfile.aarch64 | 6 ++++-- Dockerfile.armhf | 6 ++++-- readme-vars.yml | 1 + 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f91cf64..fd16251 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:3.9 +FROM lsiobase/alpine:3.10 # set version label ARG BUILD_DATE @@ -41,7 +41,7 @@ RUN \ openal-soft-dev \ python-dev \ sqlite-dev && \ - apk add --no-cache --virtual=build-dependencies \ + apk add --no-cache --virtual=build-dependencies-2 \ --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \ leveldb-dev && \ echo "**** install runtime packages ****" && \ @@ -121,6 +121,8 @@ RUN \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ + apk del --purge \ + build-dependencies-2 && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index af8cef2..7a6c79b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm64v8-3.9 +FROM lsiobase/alpine:arm64v8-3.10 # set version label ARG BUILD_DATE @@ -41,7 +41,7 @@ RUN \ openal-soft-dev \ python-dev \ sqlite-dev && \ - apk add --no-cache --virtual=build-dependencies \ + apk add --no-cache --virtual=build-dependencies-2 \ --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \ leveldb-dev && \ echo "**** install runtime packages ****" && \ @@ -121,6 +121,8 @@ RUN \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ + apk del --purge \ + build-dependencies-2 && \ rm -rf \ /tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a25d005..f901532 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm32v7-3.9 +FROM lsiobase/alpine:arm32v7-3.10 # set version label ARG BUILD_DATE @@ -41,7 +41,7 @@ RUN \ openal-soft-dev \ python-dev \ sqlite-dev && \ - apk add --no-cache --virtual=build-dependencies \ + apk add --no-cache --virtual=build-dependencies-10 \ --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \ leveldb-dev && \ echo "**** install runtime packages ****" && \ @@ -121,6 +121,8 @@ RUN \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ + apk del --purge \ + build-dependencies-2 && \ rm -rf \ /tmp/* diff --git a/readme-vars.yml b/readme-vars.yml index 1ebafdc..87563ab 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | https://hub.docker.com/r/linuxserver/{{ project_name }}/tags # changelog changelogs: + - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "03.06.19:", desc: "Adding custom cli vars to options." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "04.03.19:", desc: "Rebase to alpine 3.9 to compile 5.0.0 minetest with new build args." } From cf09e0f60f40c3c4ee56b7f7990f0b7326eae84b Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 28 Jun 2019 22:06:46 -0700 Subject: [PATCH 2/2] typo --- Dockerfile.armhf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f901532..899bbbd 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -41,7 +41,7 @@ RUN \ openal-soft-dev \ python-dev \ sqlite-dev && \ - apk add --no-cache --virtual=build-dependencies-10 \ + apk add --no-cache --virtual=build-dependencies-2 \ --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \ leveldb-dev && \ echo "**** install runtime packages ****" && \