Accepting request 461899 from home:jordimassaguerpla:branch:Vc:update_docker_1_13

- update docker to 1.13.0
  see details in https://github.com/docker/docker/releases/tag/v1.13.0 
- use the same buildflags for building docker and for building the
  tests.
- enable pkcs11:
  37fa75b344

OBS-URL: https://build.opensuse.org/request/show/461899
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=169

_service

@@ -3,8 +3,8 @@
     <param name="url">https://github.com/docker/docker.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">1.12.6</param>
+    <param name="versionformat">1.13.0</param>
-    <param name="revision">v1.12.6</param>
+    <param name="revision">v1.13.0</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">docker-*.tar</param>

docker-1.12.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ade8df08afa29834e772ae9061975801ff35bd2b4c7979df4ff4df8f22ffce8c
-size 11190120

docker-1.13.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1da90f2f637d55c7bef034761f0781a7cc4facdefc50b9d77f0c6a78185efe0a
+size 5130016

docker.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Feb  1 15:59:40 UTC 2017 - jmassaguerpla@suse.com
+
+- update docker to 1.13.0
+
+  see details in https://github.com/docker/docker/releases/tag/v1.13.0 
+
+- use the same buildflags for building docker and for building the
+  tests.
+
+- enable pkcs11:
+  https://github.com/docker/docker/commit/37fa75b3447007bb8ea311f02610bb383b0db77f
+
 -------------------------------------------------------------------
 Fri Jan 27 12:30:18 UTC 2017 - bg@suse.com
 

docker.spec

@@ -36,7 +36,7 @@
 %global docker_migration_warnfile %{docker_store}/docker-update-message.txt
 %define docker_graph              %{docker_store}/graph
 %define git_version 78d1802
-%define version_unconverted 1.12.6
+%define version_unconverted 1.13.0
 %define __arch_install_post export NO_BRP_STRIP_DEBUG=true
 # When upgrading to a new version requires the service not to be restarted
 # Due to a long migration process update last_migration_version to the new version
@@ -44,7 +44,7 @@
 # 1.10.1
 %global last_migration_version 1.10.1
 Name:           docker
-Version:        1.12.6
+Version:        1.13.0
 Release:        0
 Summary:        The Linux container runtime
 License:        Apache-2.0
@@ -72,10 +72,13 @@ Patch200:       docker-mount-secrets.patch
 Patch300:       integration-cli-fix-TestInfoEnsureSucceeds.patch
 BuildRequires:  audit
 BuildRequires:  bash-completion
+BuildRequires:  ca-certificates
 BuildRequires:  device-mapper-devel >= 1.2.68
 BuildRequires:  glibc-devel-static
 BuildRequires:  libapparmor-devel
 BuildRequires:  libbtrfs-devel >= 3.8
+BuildRequires:  libseccomp-devel
+BuildRequires:  libtool
 BuildRequires:  procps
 BuildRequires:  sqlite3-devel
 BuildRequires:  systemd-devel
@@ -83,12 +86,13 @@ BuildRequires:  zsh
 Requires:       apparmor-parser
 Requires:       bridge-utils
 Requires:       ca-certificates-mozilla
+Requires:       docker-libnetwork = 0.0.0+git20161019.0f53435
 # Containerd and runC are required as they are the only currently supported
 # execdrivers of Docker. NOTE: The version pinning here matches upstream's
 # Dockerfile to ensure that we don't use a slightly incompatible version of
 # runC or containerd (which would be bad).
-Requires:       containerd = 0.2.5+gitr569_2a5e70c
+Requires:       containerd = 0.2.5+gitr608_03e5862
-Requires:       runc = 0.1.1+gitr2819_50a19c6
+Requires:       runc = 0.1.1+gitr2942_2f7393a
 # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
 Requires:       e2fsprogs
 Requires:       git-core >= 1.7
@@ -188,9 +192,18 @@ ln -s %{_bindir}/go-6 $tmphack/go
 export PATH=$tmphack:$PATH
 %endif
 
+# Note that these commands do not allow %%elseif.
+# For versions equal to or below SLE12 && openSUSE_13.2 libdevmapper.h is not
+# recent enough to define dm_task_deferred_remove(). (This is not true of
+# SLE12_SP1 but we cannot distinguish it with this macro.)
+BUILDTAGS="exclude_graphdriver_aufs apparmor seccomp selinux pkcs11"
+%if 0%{?suse_version} <= 1320
+	BUILDTAGS="libdm_no_deferred_remove $BUILDTAGS"
+%endif
+
 (cat <<EOF
 export AUTO_GOPATH=1
-export DOCKER_BUILDTAGS="exclude_graphdriver_aufs apparmor selinux"
+export DOCKER_BUILDTAGS="$BUILDTAGS"
 export DOCKER_GITCOMMIT=%{git_version}
 EOF
 ) > docker_build_env
@@ -233,22 +246,13 @@ cp -avr %{buildroot}/usr/src/%{name} $HOME/go/src/github.com/docker/docker
 
 cd $HOME/go/src/github.com/docker/docker
 
-# Note that these commands do not allow %%elseif.
-# For versions equal to or below SLE12 && openSUSE_13.2 libdevmapper.h is not
-# recent enough to define dm_task_deferred_remove(). (This is not true of
-# SLE12_SP1 but we cannot distinguish it with this macro.)
-EXCLUDE_TAGS=
-%if 0%{?suse_version} <= 1320
-	EXCLUDE_TAGS="libdm_no_deferred_remove $EXCLUDE_TAGS"
-%endif
-
 # The command is taken from hack/make/test-unit and various test runs.
 # Everything that follows github.com/docker/pkg/integration-cli are packages
 # containing tests that cannot run in an obs build context.
 PKG_LIST=$(go list -e \
 		-f '{{if ne .Name "github.com/docker/docker"}} {{.ImportPath}}
 		{{end}}'  \
-		-tags $EXCLUDE_TAGS \
+		-tags "$DOCKER_BUILDTAGS" \
 		-a "${BUILDFLAGS[@]}" ... \
 		| grep 'github.com/docker/docker' \
 		| grep -v 'github.com/docker/docker/vendor' \
@@ -273,7 +277,7 @@ PKG_LIST=$(go list -e \
 		| grep -v 'github.com/docker/docker/man$' \
 		| grep -v 'github.com/docker/docker/pkg/integration$')
 
-go test -cover -ldflags -w -tags $EXCLUDE_TAGS -a -test.timeout=10m $PKG_LIST
+go test -cover -ldflags -w -tags "$DOCKER_BUILDTAGS" -a -test.timeout=10m $PKG_LIST
 %endif
 
 %install
@@ -282,11 +286,9 @@ install -d %{buildroot}%{_bindir}
 %ifarch %{go_arches}
 install -D -m755 bundles/latest/dynbinary-client/%{name} %{buildroot}/%{_bindir}/%{name}
 install -D -m755 bundles/latest/dynbinary-daemon/%{name}d %{buildroot}/%{_bindir}/%{name}d
-install -D -m755 bundles/latest/dynbinary-daemon/%{name}-proxy %{buildroot}/%{_bindir}/%{name}-proxy
 %else
 install -D -m755 bundles/latest/dyngccgo/%{name} %{buildroot}/%{_bindir}/%{name}
 install -D -m755 bundles/latest/dyngccgo/%{name}d %{buildroot}/%{_bindir}/%{name}d
-install -D -m755 bundles/latest/dyngccgo/%{name}-proxy %{buildroot}/%{_bindir}/%{name}-proxy
 %endif
 install -d %{buildroot}/%{_prefix}/lib/docker
 install -Dd -m 0755 \
@@ -392,7 +394,6 @@ fi
 %doc README.md LICENSE README_SUSE.md
 %{_bindir}/docker
 %{_bindir}/dockerd
-%{_bindir}/docker-proxy
 %{_sbindir}/rcdocker
 %{_libexecdir}/docker/
 %{_unitdir}/%{name}.service

integration-cli-fix-TestInfoEnsureSucceeds.patch

@@ -1,18 +1,8 @@
-From 0f0c0fcb5b956782385e25c7c6c625e6c79ac78f Mon Sep 17 00:00:00 2001
-From: Thomas Hipp <thipp@suse.de>
-Date: Wed, 7 Sep 2016 10:54:09 +0200
-Subject: [PATCH] integration-cli: fix TestInfoEnsureSucceeds
-
-Signed-off-by: Thomas Hipp <thipp@suse.de>
----
- integration-cli/docker_cli_info_test.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/integration-cli/docker_cli_info_test.go b/integration-cli/docker_cli_info_test.go
-index a48e69a..c265a36 100644
+index 62ce7e2..46516f9 100644
 --- a/integration-cli/docker_cli_info_test.go
 +++ b/integration-cli/docker_cli_info_test.go
-@@ -36,7 +36,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
+@@ -40,7 +40,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
  	}
  
  	if DaemonIsLinux.Condition() {
@@ -20,7 +10,4 @@ index a48e69a..c265a36 100644
 +		stringsToCheck = append(stringsToCheck, "Runtimes:", "Default Runtime: oci")
  	}
  
- 	if utils.ExperimentalBuild() {
+ 	if experimentalDaemon {
--- 
-2.9.3
-