Merge pull request #456 from andrewhsu/p

andrewhsu · web-flow · commit 49e42a61518f · 2018-03-08T09:58:32.000-08:00
[18.03] Use new 'dynamic' args in install.sh
diff --git 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ fi`
`11`	`11`	`set -e`
`12`	`12`	`cd engine`
`13`	`13`	`# I want to rip this install-binaries script out so badly`
`14`		`- for component in tini proxy runc containerd;do`
	`14`	`+ for component in tini "proxy dynamic" "runc all" "containerd dynamic";do`
`15`	`15`	`TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component`
`16`	`16`	`done`
`17`	`17`	`)`