mirror/github.com-tmaier-docker-compose
1
0
Fork 0
mirror of https://github.com/tmaier/docker-compose synced 2024-11-22 16:01:59 +01:00
Code Issues

Merge pull request #29 from kaito3desuyo/master

Browse Source 
Update Docker to 20.10 and Docker Compose 1.28.x
This commit is contained in:
Tobias L. Maier 2021-04-09 15:31:44 +02:00 committed by GitHub
commit 0162936de0
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCKER_AND_COMPOSE_VERSION_MATRIX
View File

@ -12,3 +12,5 @@ latest
18.09 1.24.*
19 1.27.*
19.03 1.27.*
20 1.28.*
20.10 1.28.*

2
Dockerfile
View File

@ -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

10
README.md
View File

@ -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