From 445c3dadbe38be43a96c972081bf45fa945b882e Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 8 Mar 2018 00:20:10 +0000 Subject: [PATCH] Use new 'dynamic' args in install.sh Scripts were changed around to do static by default, this changes so that we have "dynamic" inserted where it needs to be inserted Signed-off-by: Eli Uriegas Upstream-commit: 130f74155e39ddc36b59d7c47867230284739710 Component: packaging --- components/packaging/deb/build-deb | 2 +- components/packaging/rpm/centos-7/docker-ce.spec | 2 +- components/packaging/rpm/fedora-26/docker-ce.spec | 2 +- components/packaging/rpm/fedora-27/docker-ce.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/packaging/deb/build-deb b/components/packaging/deb/build-deb index 7bf5396a7b..a0c651952c 100755 --- a/components/packaging/deb/build-deb +++ b/components/packaging/deb/build-deb @@ -11,7 +11,7 @@ fi set -e cd engine # I want to rip this install-binaries script out so badly - for component in tini proxy runc containerd;do + for component in tini "proxy dynamic" "runc all" "containerd dynamic";do TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component done ) diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index efabb8f49a..82b5042423 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -67,7 +67,7 @@ pushd /go/src/github.com/docker/cli make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli popd pushd engine -for component in tini proxy runc containerd;do +for component in tini "proxy dynamic" "runc all" "containerd dynamic";do TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component done VERSION=%{_origversion} hack/make.sh dynbinary diff --git a/components/packaging/rpm/fedora-26/docker-ce.spec b/components/packaging/rpm/fedora-26/docker-ce.spec index 26b77261a7..7f6a2858c5 100644 --- a/components/packaging/rpm/fedora-26/docker-ce.spec +++ b/components/packaging/rpm/fedora-26/docker-ce.spec @@ -65,7 +65,7 @@ pushd /go/src/github.com/docker/cli make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli popd pushd engine -for component in tini proxy runc containerd;do +for component in tini "proxy dynamic" "runc all" "containerd dynamic";do TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component done VERSION=%{_origversion} hack/make.sh dynbinary diff --git a/components/packaging/rpm/fedora-27/docker-ce.spec b/components/packaging/rpm/fedora-27/docker-ce.spec index cb53ac0b29..337831fae5 100644 --- a/components/packaging/rpm/fedora-27/docker-ce.spec +++ b/components/packaging/rpm/fedora-27/docker-ce.spec @@ -66,7 +66,7 @@ pushd /go/src/github.com/docker/cli make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli popd pushd engine -for component in tini proxy runc containerd;do +for component in tini "proxy dynamic" "runc all" "containerd dynamic";do TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component done VERSION=%{_origversion} hack/make.sh dynbinary