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

Commit 88176d0

Browse files
committed
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> (cherry picked from commit 59164be) Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
1 parent 3e53917 commit 88176d0

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

components/packaging/deb/build-deb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ if [[ -z "$DEB_VERSION" ]]; then
77
exit 1
88
fi
99

10-
# I want to rip this install-binaries script out so badly
11-
cd engine
12-
TMP_GOPATH="/go" bash hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
13-
if [[ $? -ne 0 ]]; then
14-
echo "Binaries required for package building not installed correctly."
15-
echo "Exiting..."
16-
exit 1
17-
fi
18-
cd -
10+
(
11+
set -e
12+
cd engine
13+
# I want to rip this install-binaries script out so badly
14+
for component in tini proxy runc containerd;do
15+
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
16+
done
17+
)
18+
1919
echo VERSION AAA $VERSION
2020

2121
VERSION=${VERSION:-$( cat engine/VERSION )}

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

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ pushd /go/src/github.com/docker/cli
6565
make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
6666
popd
6767
pushd engine
68-
TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
68+
for component in tini proxy runc containerd;do
69+
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
70+
done
6971
VERSION=%{_origversion} hack/make.sh dynbinary
7072
popd
7173
mkdir -p plugin

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ pushd /go/src/github.com/docker/cli
6666
make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
6767
popd
6868
pushd engine
69-
TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
69+
for component in tini proxy runc containerd;do
70+
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
71+
done
7072
VERSION=%{_origversion} hack/make.sh dynbinary
7173
popd
7274
mkdir -p plugin

0 commit comments

Comments
 (0)