From 5c701ab27a29c54ffe4a7b06811806a75ed43fa5 Mon Sep 17 00:00:00 2001 From: Hans van den Bogert Date: Sat, 11 Apr 2020 13:21:00 +0200 Subject: [PATCH 1/3] Change: Remove v1.12 image build It is no longer supported and its alpine version does not have python3 --- DOCKER_AND_COMPOSE_VERSION_MATRIX | 1 - 1 file changed, 1 deletion(-) diff --git a/DOCKER_AND_COMPOSE_VERSION_MATRIX b/DOCKER_AND_COMPOSE_VERSION_MATRIX index 0284187..a9ac1be 100644 --- a/DOCKER_AND_COMPOSE_VERSION_MATRIX +++ b/DOCKER_AND_COMPOSE_VERSION_MATRIX @@ -1,5 +1,4 @@ latest -1.12 1.8.* 1.13 1.10.* 17 1.18.* 17.03 1.11.* From 139eb99ea92693343f2703e9acadadb4730b95b7 Mon Sep 17 00:00:00 2001 From: Hans van den Bogert Date: Sat, 11 Apr 2020 13:45:23 +0200 Subject: [PATCH 2/3] Fix: use python3 explicitly This was problematic for docker 1.1x image otherwise --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 892c09b..b8dad83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM docker:${DOCKER_VERSION} ARG COMPOSE_VERSION= ARG DOCKER_VERSION -RUN apk add --no-cache py3-pip +RUN apk add --no-cache py3-pip python3 RUN apk add --virtual build-dependencies python3-dev libffi-dev openssl-dev gcc libc-dev make \ && pip3 install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" \ && apk del build-dependencies From fe26d7e405dc2f335feba979ba17ea4f8548a963 Mon Sep 17 00:00:00 2001 From: Hans van den Bogert Date: Sat, 11 Apr 2020 13:46:29 +0200 Subject: [PATCH 3/3] Fix: Use apk --no-cache for virtual packages --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b8dad83..a8a30e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG COMPOSE_VERSION= ARG DOCKER_VERSION RUN apk add --no-cache py3-pip python3 -RUN apk add --virtual build-dependencies python3-dev libffi-dev openssl-dev gcc libc-dev make \ +RUN apk add --no-cache --virtual build-dependencies python3-dev libffi-dev openssl-dev gcc libc-dev make \ && pip3 install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" \ && apk del build-dependencies