From 23beeb353c08e2c53df0d7e7f97d0d70b05d8c25 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Mon, 15 Oct 2018 19:14:58 -0700
Subject: [PATCH] Update versions in Dockerfiles
Signed-off-by: Joffrey F <joffrey@docker.com>
---
Dockerfile | 9 ++-------
Dockerfile.run | 6 +++---
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 9df78a826..aa3e1d87b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,4 @@
+FROM docker:18.06.1 as docker
FROM python:3.6
RUN set -ex; \
@@ -8,13 +9,7 @@ RUN set -ex; \
python-dev \
git
-RUN curl -fsSL -o dockerbins.tgz "https://download.docker.com/linux/static/stable/x86_64/docker-17.12.0-ce.tgz" && \
- SHA256=692e1c72937f6214b1038def84463018d8e320c8eaf8530546c84c2f8f9c767d; \
- echo "${SHA256} dockerbins.tgz" | sha256sum -c - && \
- tar xvf dockerbins.tgz docker/docker --strip-components 1 && \
- mv docker /usr/local/bin/docker && \
- chmod +x /usr/local/bin/docker && \
- rm dockerbins.tgz
+COPY --from=docker /usr/local/bin/docker /usr/local/bin/docker
# Python3 requires a valid locale
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
diff --git a/Dockerfile.run b/Dockerfile.run
index bf87fc335..ccc86ea96 100644
--- a/Dockerfile.run
+++ b/Dockerfile.run
@@ -1,7 +1,7 @@
-FROM docker:17.12.1 as docker
-FROM alpine:3.6
+FROM docker:18.06.1 as docker
+FROM alpine:3.8
-ENV GLIBC 2.27-r0
+ENV GLIBC 2.28-r0
RUN apk update && apk add --no-cache openssl ca-certificates curl libgcc && \
curl -fsSL -o /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \