From ce470fab4f405fe9bf5cdbbd2f01bcbea6925726 Mon Sep 17 00:00:00 2001
From: Eli Uriegas <eli.uriegas@docker.com>
Date: Fri, 23 Feb 2018 19:39:27 +0000
Subject: [PATCH] Fixes binary installation

Binary installation was broken after the
hack/dockerfile/install-binaries script was removed.

This remedies that.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 59164bedeab571029805a107e8e5a32fc9cd56b3
Component: packaging
---
 components/packaging/deb/build-deb             | 18 +++++++++---------
 .../packaging/rpm/centos-7/docker-ce.spec      |  4 +++-
 .../packaging/rpm/fedora-26/docker-ce.spec     |  4 +++-
 .../packaging/rpm/fedora-27/docker-ce.spec     |  4 +++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/components/packaging/deb/build-deb b/components/packaging/deb/build-deb
index 179c2b088d..7bf5396a7b 100755
--- a/components/packaging/deb/build-deb
+++ b/components/packaging/deb/build-deb
@@ -7,15 +7,15 @@ if [[ -z "$DEB_VERSION" ]]; then
     exit 1
 fi
 
-# I want to rip this install-binaries script out so badly
-cd engine
-TMP_GOPATH="/go" bash hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
-if [[ $? -ne 0 ]]; then
-    echo "Binaries required for package building not installed correctly."
-    echo "Exiting..."
-    exit 1
-fi
-cd -
+(
+    set -e
+    cd engine
+    # I want to rip this install-binaries script out so badly
+    for component in tini proxy runc containerd;do
+        TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
+    done
+)
+
 echo VERSION AAA $VERSION
 
 VERSION=${VERSION:-$( cat engine/VERSION )}
diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec
index 14538b5829..efabb8f49a 100644
--- a/components/packaging/rpm/centos-7/docker-ce.spec
+++ b/components/packaging/rpm/centos-7/docker-ce.spec
@@ -67,7 +67,9 @@ pushd /go/src/github.com/docker/cli
 make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
 popd
 pushd engine
-TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
+for component in tini proxy runc containerd;do
+    TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
+done
 VERSION=%{_origversion} hack/make.sh dynbinary
 popd
 
diff --git a/components/packaging/rpm/fedora-26/docker-ce.spec b/components/packaging/rpm/fedora-26/docker-ce.spec
index 1b4a66d676..26b77261a7 100644
--- a/components/packaging/rpm/fedora-26/docker-ce.spec
+++ b/components/packaging/rpm/fedora-26/docker-ce.spec
@@ -65,7 +65,9 @@ pushd /go/src/github.com/docker/cli
 make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
 popd
 pushd engine
-TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
+for component in tini proxy runc containerd;do
+    TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
+done
 VERSION=%{_origversion} hack/make.sh dynbinary
 popd
 mkdir -p plugin
diff --git a/components/packaging/rpm/fedora-27/docker-ce.spec b/components/packaging/rpm/fedora-27/docker-ce.spec
index 3728eae15a..cb53ac0b29 100644
--- a/components/packaging/rpm/fedora-27/docker-ce.spec
+++ b/components/packaging/rpm/fedora-27/docker-ce.spec
@@ -66,7 +66,9 @@ pushd /go/src/github.com/docker/cli
 make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
 popd
 pushd engine
-TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
+for component in tini proxy runc containerd;do
+    TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
+done
 VERSION=%{_origversion} hack/make.sh dynbinary
 popd
 mkdir -p plugin