Accepting request 447306 from Virtualization:containers

1 OBS-URL: https://build.opensuse.org/request/show/447306 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=49
2017-01-10 09:43:25 +00:00 · 2017-01-10 09:43:25 +00:00 · 472f65fb18
commit 472f65fb18
parent 96520b1ecb d7c5e8e7f3
10 changed files with 75 additions and 110 deletions
--- a/4
+++ b/4
@ -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.3</param>
-    <param name="revision">v1.12.3</param>
+    <param name="versionformat">1.12.5</param>
+    <param name="revision">v1.12.5</param>
  </service>
  <service name="recompress" mode="disabled">
    <param name="file">docker-*.tar</param>
--- a/boltdb_bolt_add_brokenUnaligned.patch
+++ b/boltdb_bolt_add_brokenUnaligned.patch
@ -0,0 +1,27 @@
+From: Michel Normand <normand@linux.vnet.ibm.com>
+Subject: boltdb bolt add brokenUnaligned for ppc64
+Date: Tue, 20 Dec 2016 10:19:01 +0100
+
+boltdb bolt add brokenUnaligned for ppc64
+as already done for bolt_ppc64le.go
+
+Correction already submitted upstream as
+https://github.com/boltdb/bolt/pull/635
+
+Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
+---
+ vendor/src/github.com/boltdb/bolt/bolt_ppc64.go |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: docker-1.12.3/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go
+===================================================================
+--- docker-1.12.3.orig/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go
+++ docker-1.12.3/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go
+@@ -7,3 +7,6 @@ const maxMapSize = 0xFFFFFFFFFFFF // 256
+ 
+ // maxAllocSize is the size used when creating array pointers.
+ const maxAllocSize = 0x7FFFFFFF
+
+// Are unaligned load/stores broken on this arch?
+var brokenUnaligned = false
+
--- a/docker-1.12.3.tar.xz
+++ b/docker-1.12.3.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:096dec850ed5124d9b822eb0dc84291a5ecbd5641ae6295eb228850d8b7805ba
-size 11188896
--- a/docker-1.12.5.tar.xz
+++ b/docker-1.12.5.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23c2068ecc2a8a283338143c76ffaf6987a93df767f7f6b6927f73310915485d
+size 11190552
--- a/docker.changes
+++ b/docker.changes
@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Tue Dec 20 12:41:33 UTC 2016 - normand@linux.vnet.ibm.com
+
+- remove netlink_gcc_go.patch after integration of PR
+  https://github.com/golang/go/issues/11707
+- new boltdb_bolt_add_brokenUnaligned.patch for ppc64
+  waiting for https://github.com/boltdb/bolt/pull/635
+
+-------------------------------------------------------------------
+Tue Dec 20 05:08:54 UTC 2016 - asarai@suse.com
+
+- Remove old flags from dockerd's command-line, to be more inline with
+  upstream (now that docker-runc is provided by the runc package). -H is
+  dropped because upstream dropped it due to concerns with socket
+  activation.
+- Remove socket activation entirely.
+
+-------------------------------------------------------------------
+Mon Dec 19 12:41:13 UTC 2016 - jmassaguerpla@suse.com
+
+- update docker to 1.12.5 (bsc#1016307).
+  This fixes bsc#1015661
+
 -------------------------------------------------------------------
 Mon Dec  5 14:52:02 UTC 2016 - jmassaguerpla@suse.com

--- a/docker.service
+++ b/docker.service
@ -1,21 +1,16 @@
 [Unit]
 Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
-After=network.target docker.socket containerd.socket
-Requires=docker.socket containerd.socket
+After=network.target containerd.socket
+Requires=containerd.socket

 [Service]
 EnvironmentFile=/etc/sysconfig/docker

-# Quick rundown of options, so we can keep track of them. Upstream's
-# service file only contains -H.
-#
-# * -H tells Docker that it's running as a socket-activated service.
-# * --containerd tells Docker to not manage the running of containerd.
-# * --add-runtime and --default-runtime tell Docker to not try to use
-#   its "bundled" runC version (which is not shipped by us) but rather use
-#   the runC version provided as by the runc package.
-ExecStart=/usr/bin/dockerd -H fd:// --containerd /run/containerd/containerd.sock --add-runtime oci=/usr/sbin/runc --default-runtime oci $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
+# While Docker has support for socket activation (-H fd://), this is not
+# enabled by default because enabling socket activation means that on boot your
+# containers won't start until someone tries to administer the Docker daemon.
+ExecStart=/usr/bin/dockerd --containerd /run/containerd/containerd.sock $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
 ExecReload=/bin/kill -s HUP $MAINPID

 # Having non-zero Limit*s causes performance problems due to accounting overhead
@ -32,7 +27,7 @@ LimitCORE=infinity
 # Only systemd 218 and above support this property.
 #Delegate=yes

-# Tis is not necessary because of how we set up containerd.
+# This is not necessary because of how we set up containerd.
 #KillMode=process

 [Install]
--- a/docker.socket
+++ b/docker.socket
@ -1,12 +0,0 @@
-[Unit]
-Description=Docker Socket for the API
-PartOf=docker.service
-
-[Socket]
-ListenStream=/var/run/docker.sock
-SocketMode=0660
-SocketUser=root
-SocketGroup=docker
-
-[Install]
-WantedBy=sockets.target
--- a/docker.spec
+++ b/docker.spec
@ -36,8 +36,7 @@
 %global docker_migration_warnfile %{docker_store}/docker-update-message.txt
 %define docker_graph              %{docker_store}/graph
 %define git_version 8eab29e
-%define version_unconverted 1.12.3
-%define docker_version 1.12.1
+%define version_unconverted 1.12.5
 %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
@ -45,7 +44,7 @@
 # 1.10.1
 %global last_migration_version 1.10.1
 Name:           docker
-Version:        1.12.3
+Version:        1.12.5
 Release:        0
 Summary:        The Linux container runtime
 License:        Apache-2.0
@ -62,8 +61,8 @@ Source9:        docker-update-message.txt
 Source10:       tests.sh
 # Fixes for architecture-specific issues (gcc-go).
 Patch100:       gcc-go-patches.patch
-Patch101:       netlink_gcc_go.patch
 Patch102:       netlink_netns_powerpc.patch
+Patch103:       boltdb_bolt_add_brokenUnaligned.patch
 # SUSE-FEATURE: Adds the /run/secrets mountpoint inside all Docker containers
 # which is not snapshotted when images are committed. Note that if you modify
 # this patch, please also modify the patch in the suse-secrets-v<version>
@ -87,8 +86,8 @@ Requires:       ca-certificates-mozilla
 # 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.4+gitr565_0366d7e
-Requires:       runc = 0.1.1+gitr2816_02f8fa7
+Requires:       containerd = 0.2.5+gitr569_2a5e70c
+Requires:       runc = 0.1.1+gitr2818_f59ba3cdd76f
 # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
 Requires:       e2fsprogs
 Requires:       git-core >= 1.7
@ -105,11 +104,6 @@ Recommends:     docker-image-migrator
 Conflicts:      lxc < 1.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    %ix86 s390 ppc
-%if 0%{?suse_version} > 1320
-Source5:        docker.socket
-%else
-Source5:        docker_systemd_lt_214.socket
-%endif
 %ifarch %{go_arches}
 BuildRequires:  go >= 1.5
 BuildRequires:  go-go-md2man
@ -180,8 +174,8 @@ Test package for docker. It contains the source code and the tests.
 %endif
 %ifnarch %{go_arches}
 %patch100 -p1
-%patch101 -p1
 %patch102 -p1
+%patch103 -p1
 %endif
 %patch300 -p1
 cp %{SOURCE7} .
@ -321,7 +315,6 @@ cp -av tests.main tests.sh %{buildroot}%{_prefix}/src/docker/hack/
 # systemd service
 #
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.socket
 ln -sf service %{buildroot}%{_sbindir}/rcdocker

 #
@ -372,7 +365,7 @@ if [[ -d "%{docker_store}" && -n "$(find "%{docker_graph}" -maxdepth 1 -type d 2
 fi

 getent group docker >/dev/null || groupadd -r docker
-%service_add_pre %{name}.service %{name}.socket
+%service_add_pre %{name}.service

 %post
 if [  -e %{docker_migration_testfile} ]; then
@ -382,18 +375,18 @@ else
        rm %{docker_migration_warnfile}
    fi
 fi
-%service_add_post %{name}.service %{name}.socket
+%service_add_post %{name}.service
 %{fillup_only -n docker}

 %preun
-%service_del_preun %{name}.service %{name}.socket
+%service_del_preun %{name}.service

 %postun
 if [  -e %{docker_migration_testfile} ]; then
    rm %{docker_migration_testfile}
    export DISABLE_RESTART_ON_UPDATE=yes
 fi
-%service_del_postun %{name}.service %{name}.socket
+%service_del_postun %{name}.service

 %files
 %defattr(-,root,root)
@ -404,7 +397,6 @@ fi
 %{_sbindir}/rcdocker
 %{_libexecdir}/docker/
 %{_unitdir}/%{name}.service
-%{_unitdir}/%{name}.socket
 %config %{_sysconfdir}/audit/rules.d/%{name}.rules
 %{_udevrulesdir}/80-%{name}.rules
 %{_localstatedir}/adm/fillup-templates/sysconfig.docker
--- a/docker_systemd_lt_214.socket
+++ b/docker_systemd_lt_214.socket
@ -1,12 +0,0 @@
-[Unit]
-Description=Docker Socket for the API
-PartOf=docker.service
-
-[Socket]
-ListenStream=/var/run/docker.sock
-SocketMode=0660
-# A Socket(User|Group) replacement workaround for systemd <= 214
-ExecStartPost=/usr/bin/chown root:docker /var/run/docker.sock
-
-[Install]
-WantedBy=sockets.target
--- a/netlink_gcc_go.patch
+++ b/netlink_gcc_go.patch
@ -1,48 +0,0 @@
-diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux.go b/vendor/src/github.com/vishvananda/netlink/link_linux.go
-index 3aa9124..6ad7c2b 100644
--- a/vendor/src/github.com/vishvananda/netlink/link_linux.go
-+++ b/vendor/src/github.com/vishvananda/netlink/link_linux.go
-@@ -415,11 +415,11 @@ func LinkAdd(link Link) error {
- 		req.Flags |= syscall.IFF_TUN_EXCL
- 		copy(req.Name[:15], base.Name)
- 		req.Flags |= uint16(tuntap.Mode)
-		_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall.TUNSETIFF), uintptr(unsafe.Pointer(&req)))
-+		_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall_TUNSETIFF), uintptr(unsafe.Pointer(&req)))
- 		if errno != 0 {
- 			return fmt.Errorf("Tuntap IOCTL TUNSETIFF failed, errno %v", errno)
- 		}
-		_, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall.TUNSETPERSIST), 1)
-+		_, _, errno = syscall.Syscall(syscall.SYS_IOCTL, file.Fd(), uintptr(syscall_TUNSETPERSIST), 1)
- 		if errno != 0 {
- 			return fmt.Errorf("Tuntap IOCTL TUNSETPERSIST failed, errno %v", errno)
- 		}
-diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_others.go b/vendor/src/github.com/vishvananda/netlink/link_linux_others.go
-new file mode 100644
-index 0000000..feb6070
--- /dev/null
-+++ b/vendor/src/github.com/vishvananda/netlink/link_linux_others.go
-@@ -0,0 +1,9 @@
-+// +build linux
-+// +build x86_64 arm64 s390x
-+
-+package netlink
-+
-+const (
-+	syscall_TUNSETIFF     = 0x400454ca
-+	syscall_TUNSETPERSIST = 0x400454ca
-+)
-diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go b/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go
-new file mode 100644
-index 0000000..fac7c06
--- /dev/null
-+++ b/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go
-@@ -0,0 +1,9 @@
-+// +build linux
-+// +build ppc64 ppc64le
-+
-+package netlink
-+
-+const (
-+	syscall_TUNSETIFF     = 0x800454ca
-+	syscall_TUNSETPERSIST = 0x800454ca
-+)