From d1aedf1a7cd61ed71651126849d3ec7334668cff Mon Sep 17 00:00:00 2001 From: "wansu.yoo" Date: Mon, 11 Sep 2017 18:34:43 +0900 Subject: [PATCH 1/1] Re-ordered build binary 1. docker cli 2. containerd 3. runc 4. engine Signed-off-by: wansu.yoo Change-Id: I97cecb72f36afbe20d0bbf78346298e11d0188aa --- packaging/docker-engine.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/docker-engine.spec b/packaging/docker-engine.spec index a48849e..8db2d17 100755 --- a/packaging/docker-engine.spec +++ b/packaging/docker-engine.spec @@ -86,19 +86,17 @@ cd ../../ %build -cd .%docker_path/engine +cd .%docker_path/ export GOROOT=%{_builddir}/%{name}-%{version}/go export PATH=$PATH:%{_builddir}/%{name}-%{version}/go/bin export GOPATH=%{_builddir}/%{name}-%{version} export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs exclude_graphdriver_devicemapper' +export CGO_ENABLED=1 go env -echo 'docker daemon' -export CGO_ENABLED=1 -AUTO_GOPATH=1 ./hack/make.sh dynbinary echo 'docker cli' -cd ../cli +cd ./cli make binary export BUILDTAGS=no_btrfs @@ -110,6 +108,10 @@ echo 'runc build' cd ../../opencontainers/runc make all BUILDTAGS="" +echo 'docker daemon' +cd ../../docker/engine +AUTO_GOPATH=1 ./hack/make.sh dynbinary + %install rm -rf %{buildroot} # install binary -- 2.7.4