Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2016-10-26 13:29:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2016-10-13 11:31:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2016-10-26 13:29:14.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Oct 13 11:15:17 UTC 2016 - jmassaguer...@suse.com + +- update docker to 1.12.2 (bsc#1004490). See changelog + +https://github.com/docker/docker/blob/v1.12.2/CHANGELOG.md + +- update docker-mount-secrets.patch to 1.12.2 code + +------------------------------------------------------------------- Old: ---- docker-1.12.1.tar.xz New: ---- docker-1.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.RWvfU9/_old 2016-10-26 13:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.RWvfU9/_new 2016-10-26 13:29:16.000000000 +0200 @@ -36,7 +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.1 +%define version_unconverted 1.12.2 %define docker_version 1.12.1 %define __arch_install_post export NO_BRP_STRIP_DEBUG=true # When upgrading to a new version requires the service not to be restarted @@ -45,7 +45,7 @@ # 1.10.1 %global last_migration_version 1.10.1 Name: docker -Version: 1.12.1 +Version: 1.12.2 Release: 0 Summary: The Linux container runtime License: Apache-2.0 @@ -87,8 +87,8 @@ # 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.3 -Requires: runc = 0.1.1+gitcc29e3d +Requires: containerd = 0.2.4+git0366d7e +Requires: runc = 0.1.1+git02f8fa7 # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used Requires: e2fsprogs Requires: git-core >= 1.7 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RWvfU9/_old 2016-10-26 13:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.RWvfU9/_new 2016-10-26 13:29:16.000000000 +0200 @@ -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.1</param> - <param name="revision">v1.12.1</param> + <param name="versionformat">1.12.2</param> + <param name="revision">v1.12.2</param> </service> <service name="recompress" mode="disabled"> <param name="file">docker-*.tar</param> ++++++ docker-1.12.1.tar.xz -> docker-1.12.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/docker/docker-1.12.1.tar.xz /work/SRC/openSUSE:Factory/.docker.new/docker-1.12.2.tar.xz differ: char 25, line 1 ++++++ docker-mount-secrets.patch ++++++ --- /var/tmp/diff_new_pack.RWvfU9/_old 2016-10-26 13:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.RWvfU9/_new 2016-10-26 13:29:16.000000000 +0200 @@ -1,20 +1,28 @@ -commit 7726422774cf8dda6766cb268b4e9110e4f68945 -Author: Aleksa Sarai <asa...@suse.de> -Date: Mon Apr 11 22:54:35 2016 +1000 +From 17cd15ba4160f0e0830453529b9b01edc308d847 Mon Sep 17 00:00:00 2001 +From: Aleksa Sarai <asa...@suse.de> +Date: Mon, 11 Apr 2016 22:54:35 +1000 +Subject: [PATCH] SUSE: implement SUSE container secrets - SUSE: implement SUSE container secrets - - This allows for us to pass in host credentials to a container, allowing - for SUSEConnect to work with containers. - - THIS PATCH IS NOT TO BE UPSTREAMED, DUE TO THE FACT THAT IT IS - SUSE-SPECIFIC, AND UPSTREAM DOES NOT APPROVE OF THIS CONCEPT BECAUSE IT - MAKES BUILDS NOT ENTIRELY REPRODUCIBLE. - - Signed-off-by: Aleksa Sarai <asa...@suse.de> +This allows for us to pass in host credentials to a container, allowing +for SUSEConnect to work with containers. + +THIS PATCH IS NOT TO BE UPSTREAMED, DUE TO THE FACT THAT IT IS +SUSE-SPECIFIC, AND UPSTREAM DOES NOT APPROVE OF THIS CONCEPT BECAUSE IT +MAKES BUILDS NOT ENTIRELY REPRODUCIBLE. + +Signed-off-by: Aleksa Sarai <asa...@suse.de> +--- + container/container_unix.go | 63 ++++++++++++ + daemon/container_operations_unix.go | 50 ++++++++++ + daemon/daemon_unix.go | 6 +- + daemon/oci_linux.go | 6 ++ + daemon/start.go | 6 ++ + daemon/suse_secrets.go | 184 ++++++++++++++++++++++++++++++++++++ + 6 files changed, 313 insertions(+), 2 deletions(-) + create mode 100644 daemon/suse_secrets.go diff --git a/container/container_unix.go b/container/container_unix.go -index 2727b818f542..07a07102f031 100644 +index 2727b81..07a0710 100644 --- a/container/container_unix.go +++ b/container/container_unix.go @@ -35,6 +35,8 @@ type Container struct { @@ -95,7 +103,7 @@ func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfig) error { container.Lock() diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go -index 55bd3fc8392d..a3ab7fbd83d1 100644 +index 55bd3fc..a3ab7fb 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go @@ -184,6 +184,56 @@ func (daemon *Daemon) getPidContainer(container *container.Container) (*containe @@ -156,7 +164,7 @@ var err error diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go -index f26691226f91..2ced1b869b81 100644 +index f266912..2ced1b8 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -809,8 +809,10 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e @@ -173,7 +181,7 @@ "/sys": "dir", "/.dockerenv": "file", diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go -index 4459d02fcad3..6af7d351ccc0 100644 +index 4459d02..6af7d35 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -656,6 +656,10 @@ func (daemon *Daemon) createSpec(c *container.Container) (*libcontainerd.Spec, e @@ -197,7 +205,7 @@ if err := setMounts(daemon, &s, c, ms); err != nil { return nil, fmt.Errorf("linux mounts: %v", err) diff --git a/daemon/start.go b/daemon/start.go -index 7a0bc2121c83..30b75ee2a616 100644 +index fcf24c5..57a8c33 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -173,6 +173,12 @@ func (daemon *Daemon) Cleanup(container *container.Container) { @@ -215,7 +223,7 @@ // Ensure that all the mounts are gone diff --git a/daemon/suse_secrets.go b/daemon/suse_secrets.go new file mode 100644 -index 000000000000..417a1a9e5b61 +index 0000000..417a1a9 --- /dev/null +++ b/daemon/suse_secrets.go @@ -0,0 +1,184 @@
