github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3307 from jmccoy555/master

Browse Source 
Updated Compose and Docker versions.
This commit is contained in:
Rolf Neugebauer 2019-03-17 16:16:16 -07:00 committed by GitHub
commit a43091d27a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
projects/compose/image/Dockerfile
View File

@ -1,10 +1,10 @@
FROM docker/compose:1.13.0
FROM docker/compose:1.23.2
# because compose requires all sorts of dynamic libs, including glibc, it is much easier to
# add docker client to compose than the reverse
ENV DOCKER_BUCKET get.docker.com
ENV DOCKER_VERSION 17.05.0-ce
ENV DOCKER_SHA256 340e0b5a009ba70e1b644136b94d13824db0aeb52e09071410f35a95d94316d9
ENV DOCKER_BUCKET download.docker.com
ENV DOCKER_VERSION 18.06.3-ce
#ENV DOCKER_SHA256 340e0b5a009ba70e1b644136b94d13824db0aeb52e09071410f35a95d94316d9
# we need docker compose and docker load
# also need curl to test availability of docker API
@ -12,8 +12,8 @@ RUN apk add --update curl
# we only need the client
RUN set -x \
&& curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
&& echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \
&& curl -fSL "https://${DOCKER_BUCKET}/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
# && echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \ #checksums don't appear to be avaliable so disabled for now.
&& tar -xzvf docker.tgz \
&& mv docker/docker /usr/bin/ \
&& rm -rf docker docker.tgz \