This repository was archived by the owner on Oct 13, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +18
-12
lines changed
Expand file tree Collapse file tree 4 files changed +18
-12
lines changed Original file line number Diff line number Diff line change @@ -7,15 +7,15 @@ if [[ -z "$DEB_VERSION" ]]; then
77 exit 1
88fi
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+
1919echo VERSION AAA $VERSION
2020
2121VERSION=${VERSION:- $( cat engine/ VERSION )}
Original file line number Diff line number Diff line change @@ -67,7 +67,9 @@ pushd /go/src/github.com/docker/cli
6767make VERSION=%{_origversion } GITCOMMIT =%{_gitcommit } dynbinary manpages # cli
6868popd
6969pushd 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
7173VERSION=%{_origversion } hack/make.sh dynbinary
7274popd
7375
Original file line number Diff line number Diff line change @@ -65,7 +65,9 @@ pushd /go/src/github.com/docker/cli
6565make VERSION=%{_origversion } GITCOMMIT =%{_gitcommit } dynbinary manpages # cli
6666popd
6767pushd 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
6971VERSION=%{_origversion } hack/make.sh dynbinary
7072popd
7173mkdir -p plugin
Original file line number Diff line number Diff line change @@ -66,7 +66,9 @@ pushd /go/src/github.com/docker/cli
6666make VERSION=%{_origversion } GITCOMMIT =%{_gitcommit } dynbinary manpages # cli
6767popd
6868pushd 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
7072VERSION=%{_origversion } hack/make.sh dynbinary
7173popd
7274mkdir -p plugin
You can’t perform that action at this time.
0 commit comments