Update docker-ce tarball 94/149794/1 accepted/tizen/unified/20170913.154607 submit/tizen/20170913.064913
authorwansu.yoo <wansu.yoo@samsung.com>
Wed, 13 Sep 2017 05:51:35 +0000 (14:51 +0900)
committerwansu.yoo <wansu.yoo@samsung.com>
Wed, 13 Sep 2017 05:59:26 +0000 (14:59 +0900)
1. docker-ce tarball is from v17.06.1-ce-dz-upload_dockerd_binary of
github.sec.samsung.net/docker-ce.
and, changes are:
1) skip cli build
2) update dockerd binary after build
2. block docker-ce build at docker-engine.spec

Signed-off-by: wansu.yoo <wansu.yoo@samsung.com>
Change-Id: I06ff97d394b0fa0f24778ca5e71e4e9c4ebf4992

packaging/docker-ce.tar.bz2
packaging/docker-engine.spec

index 3993f4c..cdc68d7 100644 (file)
Binary files a/packaging/docker-ce.tar.bz2 and b/packaging/docker-ce.tar.bz2 differ
index a48849e..7d26b31 100755 (executable)
@@ -93,9 +93,11 @@ export GOPATH=%{_builddir}/%{name}-%{version}
 export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs exclude_graphdriver_devicemapper'
 
 go env
-echo 'docker daemon'
-export CGO_ENABLED=1
-AUTO_GOPATH=1 ./hack/make.sh dynbinary
+echo "skip docker daemon build"
+echo "will be used from docker-ec build result"
+###echo 'docker daemon'
+###export CGO_ENABLED=1
+###AUTO_GOPATH=1 ./hack/make.sh dynbinary
 
 echo 'docker cli'
 cd ../cli