Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 2329a94

Browse files
seemethereandrewhsu
authored andcommitted
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 <eli.uriegas@docker.com> (cherry picked from commit 130f741) Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
1 parent 23a9017 commit 2329a94

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

components/packaging/deb/build-deb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111
set -e
1212
cd engine
1313
# 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
1515
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
1616
done
1717
)

components/packaging/rpm/centos-7/docker-ce.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pushd /go/src/github.com/docker/cli
6767
make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
6868
popd
6969
pushd engine
70-
for component in tini proxy runc containerd;do
70+
for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
7171
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
7272
done
7373
VERSION=%{_origversion} hack/make.sh dynbinary

components/packaging/rpm/fedora-26/docker-ce.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pushd /go/src/github.com/docker/cli
6565
make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
6666
popd
6767
pushd engine
68-
for component in tini proxy runc containerd;do
68+
for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
6969
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
7070
done
7171
VERSION=%{_origversion} hack/make.sh dynbinary

components/packaging/rpm/fedora-27/docker-ce.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pushd /go/src/github.com/docker/cli
6666
make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
6767
popd
6868
pushd engine
69-
for component in tini proxy runc containerd;do
69+
for component in tini "proxy dynamic" "runc all" "containerd dynamic";do
7070
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
7171
done
7272
VERSION=%{_origversion} hack/make.sh dynbinary

0 commit comments

Comments
 (0)