From 45b43d2050d837e34f0d9f3b114c417cdb82c33a Mon Sep 17 00:00:00 2001
From: Eli Uriegas <eli.uriegas@docker.com>
Date: Wed, 22 Aug 2018 23:24:42 +0000
Subject: [PATCH] Wire up dependencies for debian, source -> .

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 99bbb6e33f46b6e2621204aac3b05344783ccfaa)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 3aeb8e9365fefea1be6e6b64624fccb81d5a70ad
Component: packaging
---
 components/packaging/image/Dockerfile.engine | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/packaging/image/Dockerfile.engine b/components/packaging/image/Dockerfile.engine
index b13edb552f..ec6c94d074 100644
--- a/components/packaging/image/Dockerfile.engine
+++ b/components/packaging/image/Dockerfile.engine
@@ -6,16 +6,16 @@ COPY hack/dockerfile/install/tini.installer /
 COPY hack/dockerfile/install/proxy.installer /
 RUN apt-get update && apt-get install -y \
     bash \
-    btrfs-progs-dev \
+    btrfs-tools \
     ca-certificates \
     cmake \
     gcc \
     git \
     libc-dev \
-    libgcc \
-    libltdl \
+    libgcc-6-dev \
+    libltdl-dev \
     libtool \
-    linux-headers \
+    linux-headers-$(dpkg --print-architecture) \
     make
 RUN grep "_COMMIT=" /*.installer  |cut -f2- -d: > /binaries-commits
 
@@ -47,7 +47,7 @@ RUN go build -o /sbin/dockerd \
 FROM builder as proxy-builder
 RUN git clone https://github.com/docker/libnetwork.git /go/src/github.com/docker/libnetwork
 WORKDIR /go/src/github.com/docker/libnetwork
-RUN source /binaries-commits && \
+RUN . /binaries-commits && \
     git checkout -q "$LIBNETWORK_COMMIT" && \
     CGO_ENABLED=0 go build -buildmode=pie -ldflags="$PROXY_LDFLAGS" \
         -o /sbin/docker-proxy \
@@ -57,17 +57,17 @@ RUN source /binaries-commits && \
 FROM builder as init-builder
 RUN git clone https://github.com/krallin/tini.git /tini
 WORKDIR /tini
-RUN source /binaries-commits && \
+RUN . /binaries-commits && \
     git checkout -q "$TINI_COMMIT" && \
     cmake . && make tini-static && \
     cp tini-static /sbin/docker-init
 
 # runc
 FROM builder as runc-builder
-RUN apk --update add libseccomp-dev
+RUN apt-get install -y libseccomp-dev
 RUN git clone https://github.com/opencontainers/runc.git /go/src/github.com/opencontainers/runc
 WORKDIR /go/src/github.com/opencontainers/runc
-RUN source /binaries-commits && \
+RUN . /binaries-commits && \
     git checkout -q "$RUNC_COMMIT" && \
     make BUILDTAGS='seccomp apparmor' static && make install