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 " \