From 92ec65ae760d4b3dc4c4cd31313b7e462f346171 Mon Sep 17 00:00:00 2001 From: kaito3desuyo Date: Tue, 13 Apr 2021 22:36:18 +0900 Subject: [PATCH 1/2] Fix rust compiler not found error at old alpine --- DOCKER_AND_COMPOSE_VERSION_MATRIX | 1 - Dockerfile | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DOCKER_AND_COMPOSE_VERSION_MATRIX b/DOCKER_AND_COMPOSE_VERSION_MATRIX index 9e6799d..cac8e08 100644 --- a/DOCKER_AND_COMPOSE_VERSION_MATRIX +++ b/DOCKER_AND_COMPOSE_VERSION_MATRIX @@ -9,7 +9,6 @@ latest 18.02 1.19.* 18.03 1.21.* 18.06 1.22.* -18.09 1.24.* 19 1.27.* 19.03 1.27.* 20 1.28.* diff --git a/Dockerfile b/Dockerfile index cab7776..c44823b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,11 @@ ARG COMPOSE_VERSION= ARG DOCKER_VERSION RUN apk add --no-cache py3-pip python3 -RUN apk add --no-cache --virtual build-dependencies python3-dev libffi-dev openssl-dev gcc libc-dev rust cargo make \ +RUN apk add --no-cache --virtual build-dependencies python3-dev libffi-dev openssl-dev gcc libc-dev make \ + && apk add --no-cache --virtual build-dependencies-after-compose-v1.28.x rust cargo || true \ && pip3 install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" \ - && apk del build-dependencies + && apk del build-dependencies \ + && apk del build-dependencies-after-compose-v1.28.x || true LABEL \ org.opencontainers.image.authors="Tobias Maier " \ From 6f55d4de07c1b1c1b0b92a613db5767802c153e2 Mon Sep 17 00:00:00 2001 From: kaito3desuyo Date: Thu, 15 Apr 2021 09:51:19 +0900 Subject: [PATCH 2/2] Remove prior v19 from version matrix file --- DOCKER_AND_COMPOSE_VERSION_MATRIX | 10 ---------- Dockerfile | 6 ++---- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/DOCKER_AND_COMPOSE_VERSION_MATRIX b/DOCKER_AND_COMPOSE_VERSION_MATRIX index cac8e08..f5d9aaf 100644 --- a/DOCKER_AND_COMPOSE_VERSION_MATRIX +++ b/DOCKER_AND_COMPOSE_VERSION_MATRIX @@ -1,14 +1,4 @@ latest -1.13 1.10.* -17 1.18.* -17.03 1.11.* -17.06 1.15.* -17.09 1.16.* -17.12 1.18.* -18 1.19.* -18.02 1.19.* -18.03 1.21.* -18.06 1.22.* 19 1.27.* 19.03 1.27.* 20 1.28.* diff --git a/Dockerfile b/Dockerfile index c44823b..cab7776 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,9 @@ ARG COMPOSE_VERSION= ARG DOCKER_VERSION RUN apk add --no-cache py3-pip python3 -RUN apk add --no-cache --virtual build-dependencies python3-dev libffi-dev openssl-dev gcc libc-dev make \ - && apk add --no-cache --virtual build-dependencies-after-compose-v1.28.x rust cargo || true \ +RUN apk add --no-cache --virtual build-dependencies python3-dev libffi-dev openssl-dev gcc libc-dev rust cargo make \ && pip3 install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" \ - && apk del build-dependencies \ - && apk del build-dependencies-after-compose-v1.28.x || true + && apk del build-dependencies LABEL \ org.opencontainers.image.authors="Tobias Maier " \