docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

Fixes binary installation

Browse Source 
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>
Upstream-commit: 59164bedeab571029805a107e8e5a32fc9cd56b3
Component: packaging
This commit is contained in:
Eli Uriegas
2018-02-23 19:39:27 +00:00
parent 1b01bb68a9
commit ce470fab4f
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/packaging/deb/build-deb
View File

@@ -7,15 +7,15 @@ if [[ -z "$DEB_VERSION" ]]; then
exit 1
fi
# I want to rip this install-binaries script out so badly
cd engine
TMP_GOPATH="/go" bash hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
if [[ $? -ne 0 ]]; then
echo "Binaries required for package building not installed correctly."
echo "Exiting..."
exit 1
fi
cd -
(
set -e
cd engine
# I want to rip this install-binaries script out so badly
for component in tini proxy runc containerd;do
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
done
)
echo VERSION AAA $VERSION
VERSION=${VERSION:-$( cat engine/VERSION )}

4
components/packaging/rpm/centos-7/docker-ce.spec
View File

@@ -67,7 +67,9 @@ pushd /go/src/github.com/docker/cli
make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
popd
pushd engine
TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
for component in tini proxy runc containerd;do
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
done
VERSION=%{_origversion} hack/make.sh dynbinary
popd

4
components/packaging/rpm/fedora-26/docker-ce.spec
View File

@@ -65,7 +65,9 @@ pushd /go/src/github.com/docker/cli
make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
popd
pushd engine
TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
for component in tini proxy runc containerd;do
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
done
VERSION=%{_origversion} hack/make.sh dynbinary
popd
mkdir -p plugin

4
components/packaging/rpm/fedora-27/docker-ce.spec
View File

@@ -66,7 +66,9 @@ pushd /go/src/github.com/docker/cli
make VERSION=%{_origversion} GITCOMMIT=%{_gitcommit} dynbinary manpages # cli
popd
pushd engine
TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
for component in tini proxy runc containerd;do
TMP_GOPATH="/go" hack/dockerfile/install/install.sh $component
done
VERSION=%{_origversion} hack/make.sh dynbinary
popd
mkdir -p plugin