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 #24 from hansbogert/master

Browse Source 
Fixes for older builds
This commit is contained in:
Tobias L. Maier 2020-04-11 18:07:46 +02:00 committed by GitHub
commit 2bd768fe17
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DOCKER_AND_COMPOSE_VERSION_MATRIX
View File

@ -1,5 +1,4 @@
latest latest
1.12 1.8.*
1.13 1.10.* 1.13 1.10.*
17 1.18.* 17 1.18.*
17.03 1.11.* 17.03 1.11.*

4
Dockerfile
View File

@ -4,8 +4,8 @@ FROM docker:${DOCKER_VERSION}
ARG COMPOSE_VERSION= ARG COMPOSE_VERSION=
ARG DOCKER_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 \ 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}" \ && pip3 install "docker-compose${COMPOSE_VERSION:+==}${COMPOSE_VERSION}" \
&& apk del build-dependencies && apk del build-dependencies