From 34c2cbc39f4c3b594dce54094de95d875aca81ad Mon Sep 17 00:00:00 2001 From: kaito3desuyo Date: Thu, 8 Apr 2021 14:01:02 +0900 Subject: [PATCH 1/3] Add docker version 20.10 and docker-compose version 1.28.* --- DOCKER_AND_COMPOSE_VERSION_MATRIX | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DOCKER_AND_COMPOSE_VERSION_MATRIX b/DOCKER_AND_COMPOSE_VERSION_MATRIX index c93cafb..9e6799d 100644 --- a/DOCKER_AND_COMPOSE_VERSION_MATRIX +++ b/DOCKER_AND_COMPOSE_VERSION_MATRIX @@ -12,3 +12,5 @@ latest 18.09 1.24.* 19 1.27.* 19.03 1.27.* +20 1.28.* +20.10 1.28.* From 4fefc9bcc18906f79fd20016c85dc4963c8b3d4a Mon Sep 17 00:00:00 2001 From: kaito3desuyo Date: Thu, 8 Apr 2021 14:42:25 +0900 Subject: [PATCH 2/3] Add dependency to build "cryptography" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a8a30e2..cab7776 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 --no-cache --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 rust cargo make \ && pip3 install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" \ && apk del build-dependencies From e340472dc98787a704218329524041c33e7ec0b0 Mon Sep 17 00:00:00 2001 From: kaito3desuyo Date: Thu, 8 Apr 2021 14:56:54 +0900 Subject: [PATCH 3/3] Fix README --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cec88a8..141af8d 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ This is very useful for CI pipelines, which leverage "Docker in Docker". ## Docker versions supported -There are versions based on different docker versions, e.g. `latest`, `17.06`, `17.03` and `1.13`. +There are versions based on different docker versions, e.g. `latest`, `20.10`, `19.03` and `1.13`. -docker-compose matches the latest minor version available when the docker release was made. Eg, `17.06` includes docker-compose 1.15.0. The `latest` tag always includes the latest docker-compose build. +docker-compose matches the latest minor version available when the docker release was made. Eg, `19.03` includes docker-compose 1.27.4. The `latest` tag always includes the latest docker-compose build. All available Docker Engine versions and the respective Docker Compose versions are defined in [`DOCKER_AND_COMPOSE_VERSION_MATRIX`](./DOCKER_AND_COMPOSE_VERSION_MATRIX). @@ -42,13 +42,13 @@ build image: You must only provide a Pull Request for the file [`DOCKER_AND_COMPOSE_VERSION_MATRIX`](./DOCKER_AND_COMPOSE_VERSION_MATRIX). -`DOCKER_AND_COMPOSE_VERSION_MATRIX` specifies in the first column the docker version. +`DOCKER_AND_COMPOSE_VERSION_MATRIX` specifies in the first column the docker version. The second column states the most recent release of docker-compose when the docker version has been released. You can see the latest matching versions of both by checking their release notes: -* https://github.com/docker/docker-ce/releases -* https://github.com/docker/compose/releases +- https://github.com/docker/docker-ce/releases +- https://github.com/docker/compose/releases ## Common issues and possible fixes