From: sy1124.kim <sy1124.kim@samsung.com>
Date: Fri, 25 Aug 2017 08:53:48 +0000 (+0900)
Subject: update branch of submoduels
X-Git-Tag: submit/trunk/20180820.043221~1^2~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fdocker-engine.git;a=commitdiff_plain;h=c6a32a0ad446160b29b03b2c751eefe909fe822d

update branch of submoduels
---

diff --git a/.gitmodules b/.gitmodules
index 6d65661..2da4420 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,12 @@
 [submodule "ext/containerd"]
 	path = ext/containerd
 	url = https://github.com/docker/containerd.git
+	branch = 6e23458c129b551d5c9871e5174f6b1b7f6d1170
 [submodule "ext/docker-ce"]
 	path = ext/docker-ce
 	url = https://github.sec.samsung.net/RS7-DeviceManagement/docker-ce.git
+	branch = v17.06.1-ce-dz
 [submodule "ext/runc"]
 	path = ext/runc
 	url = https://github.com/docker/runc.git
+	branch = 810190ceaa507aa2727d7ae6f4790c76ec150bd2
diff --git a/packaging/containerd.tar.bz2 b/packaging/containerd.tar.bz2
index 723c7c7..7759a30 100644
Binary files a/packaging/containerd.tar.bz2 and b/packaging/containerd.tar.bz2 differ
diff --git a/packaging/docker-ce.tar.bz2 b/packaging/docker-ce.tar.bz2
index 26ddbd4..80009ea 100644
Binary files a/packaging/docker-ce.tar.bz2 and b/packaging/docker-ce.tar.bz2 differ
diff --git a/packaging/docker-engine.spec b/packaging/docker-engine.spec
index ccdd2c8..230c581 100755
--- a/packaging/docker-engine.spec
+++ b/packaging/docker-engine.spec
@@ -1,4 +1,4 @@
-%define project_path /src/github.com/docker
+%define docker_path /src/github.com/docker
 %define runc_path /src/github.com/opencontainers
 %define container_path /src/github.com/containerd
 %define go_version 1.8.3
@@ -54,24 +54,31 @@ rm -f %{_builddir}/%{name}-%{version}/go%{go_version}.linux-amd64.tar.gz
 %endif
 chmod g-w %_sourcedir/*
 cp %{SOURCE1} ./%{name}.manifest
+
+# docker-ce tar file
 cp %{SOURCE13} .
 tar -xvf %{SOURCE13}
+
+# containerd tar file
 cp %{SOURCE14} .
 tar -xvf %{SOURCE14}
+
+# runc tar file
 cp %{SOURCE15} .
 tar -xvf %{SOURCE15}
 
-mkdir -p .%project_path/
+## set docker build folder
+mkdir -p .%docker_path/
+mkdir -p .%docker_path/engine
+mkdir -p .%docker_path/cli
+mkdir -p .%container_path/containerd
 mkdir -p .%runc_path/
-mkdir -p .%project_path/engine
-mkdir -p .%project_path/cli
 mkdir -p .%runc_path/runc
-mkdir -p .%container_path/containerd
 
 cd ext/docker-ce/components/engine
-mv `ls . | grep -v packaging | grep -v src` ../../../..%project_path/engine
+mv `ls . | grep -v packaging | grep -v src` ../../../..%docker_path/engine
 cd ../cli/
-mv `ls . | grep -v packaging | grep -v src` ../../../..%project_path/cli
+mv `ls . | grep -v packaging | grep -v src` ../../../..%docker_path/cli
 cd ../../../containerd/
 mv `ls . | grep -v packaging | grep -v src` ../..%container_path/containerd
 cd ../runc/
@@ -80,7 +87,7 @@ cd ../../
 
 
 %build
-cd .%project_path/engine
+cd .%docker_path/engine
 export GOROOT=%{_builddir}/%{name}-%{version}/go
 export PATH=$PATH:%{_builddir}/%{name}-%{version}/go/bin
 export GOPATH=%{_builddir}/%{name}-%{version}
@@ -104,13 +111,12 @@ echo 'runc build'
 cd ../../opencontainers/runc
 make all BUILDTAGS=""
 
-
 %install
 rm -rf %{buildroot}
 # install binary
 install -d $RPM_BUILD_ROOT/%{_bindir}
-install -p -m 755 .%project_path/cli/build/docker-linux-arm $RPM_BUILD_ROOT/%{_bindir}/docker
-install -p -m 755 .%project_path/engine/bundles/%{orig_version}/dynbinary-daemon/dockerd-%{orig_version} $RPM_BUILD_ROOT/%{_bindir}/dockerd
+install -p -m 755 .%docker_path/cli/build/docker-linux-arm $RPM_BUILD_ROOT/%{_bindir}/docker
+install -p -m 755 .%docker_path/engine/bundles/%{orig_version}/dynbinary-daemon/dockerd-%{orig_version} $RPM_BUILD_ROOT/%{_bindir}/dockerd
 install -p -m 755 .%runc_path/runc/runc $RPM_BUILD_ROOT/%{_bindir}/docker-runc
 install -p -m 755 .%container_path/containerd/bin/containerd $RPM_BUILD_ROOT/%{_bindir}/docker-containerd
 install -p -m 755 .%container_path/containerd/bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-shim
@@ -125,4 +131,4 @@ install -p -m 755 .%container_path/containerd/bin/ctr $RPM_BUILD_ROOT/%{_bindir}
 /%{_bindir}/docker-containerd-shim
 /%{_bindir}/docker-containerd-ctr
 /%{_bindir}/docker-runc
-
+%license .%docker_path/engine/LICENSE
diff --git a/packaging/runc.tar.bz2 b/packaging/runc.tar.bz2
index d564bfa..7403884 100644
Binary files a/packaging/runc.tar.bz2 and b/packaging/runc.tar.bz2 differ