From 08f71a8d3d73f32d890b7485d0c3449ffb9e97f8 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 8 Mar 2018 15:44:42 -0800
Subject: [PATCH] Update Dockerfile.run to produce smaller image
Signed-off-by: Joffrey F <joffrey@docker.com>
---
Dockerfile.run | 40 +++++++++-------------------------------
1 file changed, 9 insertions(+), 31 deletions(-)
diff --git a/Dockerfile.run b/Dockerfile.run
index b3f9a01f6..04acf01c3 100644
--- a/Dockerfile.run
+++ b/Dockerfile.run
@@ -1,42 +1,20 @@
-FROM sgerrand/glibc-builder as glibc
-RUN apt-get install -yq bison
-
-ENV PKGDIR /pkgdata
-
-RUN mkdir -p /usr/glibc-compat/etc && touch /usr/glibc-compat/etc/ld.so.conf
-RUN /builder 2.27 /usr/glibc-compat || true
-RUN mkdir -p $PKGDIR
-RUN tar -xf /glibc-bin-2.27.tar.gz -C $PKGDIR
-RUN rm "$PKGDIR"/usr/glibc-compat/etc/rpc && \
- rm -rf "$PKGDIR"/usr/glibc-compat/bin && \
- rm -rf "$PKGDIR"/usr/glibc-compat/sbin && \
- rm -rf "$PKGDIR"/usr/glibc-compat/lib/gconv && \
- rm -rf "$PKGDIR"/usr/glibc-compat/lib/getconf && \
- rm -rf "$PKGDIR"/usr/glibc-compat/lib/audit && \
- rm -rf "$PKGDIR"/usr/glibc-compat/share && \
- rm -rf "$PKGDIR"/usr/glibc-compat/var
-
-
FROM alpine:3.6
-RUN apk update && apk add --no-cache openssl ca-certificates
-COPY --from=glibc /pkgdata/ /
+ENV GLIBC 2.27-r0
+ENV DOCKERBINS_SHA 1270dce1bd7e1838d62ae21d2505d87f16efc1d9074645571daaefdfd0c14054
-RUN mkdir -p /lib /lib64 /usr/glibc-compat/lib/locale /etc && \
+RUN apk update && apk add --no-cache openssl ca-certificates curl && \
+ curl -fsSL -o /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub && \
+ curl -fsSL -o glibc-$GLIBC.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC/glibc-$GLIBC.apk && \
+ apk add --no-cache glibc-$GLIBC.apk && \
ln -s /lib/libz.so.1 /usr/glibc-compat/lib/ && \
ln -s /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib && \
- ln -s /usr/glibc-compat/lib/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2 && \
- ln -s /usr/glibc-compat/lib/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 && \
- ln -s /usr/glibc-compat/etc/ld.so.cache /etc/ld.so.cache
-
-RUN apk add --no-cache curl && \
- 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 - && \
+ curl -fsSL -o dockerbins.tgz "https://download.docker.com/linux/static/stable/x86_64/docker-17.12.1-ce.tgz" && \
+ echo "${DOCKERBINS_SHA} 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 && \
+ rm dockerbins.tgz /etc/apk/keys/sgerrand.rsa.pub glibc-$GLIBC.apk && \
apk del curl
COPY dist/docker-compose-Linux-x86_64 /usr/local/bin/docker-compose