Accepting request 701147 from Virtualization:containers

Update to Docker 18.09.6-ce.

OBS-URL: https://build.opensuse.org/request/show/701147
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=89

_service

@@ -3,8 +3,8 @@
     <param name="url">https://github.com/docker/docker-ce.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">18.09.3_ce.%h</param>
+    <param name="versionformat">18.09.6_ce_%h</param>
-    <param name="revision">v18.09.3</param>
+    <param name="revision">v18.09.6</param>
     <param name="filename">docker</param>
   </service>
   <service name="recompress" mode="disabled">

bsc1001161-0001-oci-include-the-domainname-in-kernel.domainname.patch

@@ -1,4 +1,4 @@
-From 244ae6114d89a495f1f2b4cf98eb5979fe1381b0 Mon Sep 17 00:00:00 2001
+From a3e63ddd20b7f52ff5e81bdb1beb867d28a1c9c8 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Sun, 17 Jun 2018 17:05:54 +1000
 Subject: [PATCH 1/2] oci: include the domainname in "kernel.domainname"
@@ -62,5 +62,5 @@ index 7611fc054d13..d5838623528e 100644
  	p := s.Linux.CgroupsPath
  	if useSystemd {
 -- 
-2.19.2
+2.21.0
 

bsc1001161-0002-cli-add-a-separate-domainname-flag.patch

@@ -1,4 +1,4 @@
-From 975d8efceb479c3d0994814cc5d488ac33d0d2d6 Mon Sep 17 00:00:00 2001
+From 1b4f9787461d00dceea94d51af8db80f0b6aa906 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Mon, 18 Jun 2018 21:58:23 +1000
 Subject: [PATCH 2/2] cli: add a separate --domainname flag
@@ -19,14 +19,14 @@ Signed-off-by: Aleksa Sarai <asarai@suse.de>
 ---
  components/cli/cli/command/container/opts.go  |  3 ++
  .../cli/cli/command/container/opts_test.go    | 31 ++++++++++++++++---
- components/cli/contrib/completion/bash/docker |  5 +--
+ components/cli/contrib/completion/bash/docker |  1 +
  components/cli/contrib/completion/zsh/_docker |  1 +
  .../cli/docs/reference/commandline/create.md  |  1 +
  .../cli/docs/reference/commandline/run.md     |  1 +
  .../reference/commandline/service_create.md   |  2 +-
  components/cli/docs/reference/run.md          |  6 ++--
  components/cli/man/docker-run.1.md            |  7 +++++
- 9 files changed, 46 insertions(+), 11 deletions(-)
+ 9 files changed, 44 insertions(+), 9 deletions(-)
 
 diff --git a/components/cli/cli/command/container/opts.go b/components/cli/cli/command/container/opts.go
 index 97906b672252..7cd9ce998c8b 100644
@@ -102,21 +102,10 @@ index 6d7c95a5ddb8..70bedc661751 100644
  }
  
 diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker
-index 44ac8f3e0ed9..c532f5142c3d 100644
+index 92d57408617e..a0d4878ee311 100644
 --- a/components/cli/contrib/completion/bash/docker
 +++ b/components/cli/contrib/completion/bash/docker
-@@ -5,8 +5,8 @@
+@@ -1809,6 +1809,7 @@ _docker_container_run_and_create() {
- #  - SC2016: Expressions don't expand in single quotes, use double quotes for that.
- #  - SC2119: Use foo "$@" if function's $1 should mean script's $1.
- #  - SC2155: Declare and assign separately to avoid masking return values.
--# 
--# You can find more details for each warning at the following page: 
-+#
-+# You can find more details for each warning at the following page:
- #    https://github.com/koalaman/shellcheck/wiki/<SCXXXX>
- #
- # bash completion file for core docker commands
-@@ -1785,6 +1785,7 @@ _docker_container_run_and_create() {
  		--dns
  		--dns-option
  		--dns-search
@@ -149,7 +138,7 @@ index d585da40ae1e..c829dbb3e5b9 100644
    -e, --env value                     Set environment variables (default [])
        --env-file value                Read in a file of environment variables (default [])
 diff --git a/components/cli/docs/reference/commandline/run.md b/components/cli/docs/reference/commandline/run.md
-index 08b9f18d68ac..f448e1acf89b 100644
+index 6a2630bd1978..a4721e4a7761 100644
 --- a/components/cli/docs/reference/commandline/run.md
 +++ b/components/cli/docs/reference/commandline/run.md
 @@ -57,6 +57,7 @@ Options:
@@ -161,7 +150,7 @@ index 08b9f18d68ac..f448e1acf89b 100644
    -e, --env value                     Set environment variables (default [])
        --env-file value                Read in a file of environment variables (default [])
 diff --git a/components/cli/docs/reference/commandline/service_create.md b/components/cli/docs/reference/commandline/service_create.md
-index 8fdb5297a102..c55c77b52d77 100644
+index bc68128d0cf9..b395a0bda064 100644
 --- a/components/cli/docs/reference/commandline/service_create.md
 +++ b/components/cli/docs/reference/commandline/service_create.md
 @@ -755,7 +755,7 @@ The swarm extends my-network to each node running the service.
@@ -223,5 +212,5 @@ index e03377001d4e..4a1464a74200 100644
     Set environment variables
  
 -- 
-2.19.2
+2.21.0
 

bsc1047218-0001-man-obey-SOURCE_DATE_EPOCH-when-generating-man-pages.patch

@@ -1,4 +1,4 @@
-From 0a2ba19d51fef679d2a695fd14c30facd5f901f1 Mon Sep 17 00:00:00 2001
+From 64f1dfcbe4313bccacbe603dcb444da82d9136d7 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Thu, 23 Aug 2018 19:53:55 +1000
 Subject: [PATCH] man: obey SOURCE_DATE_EPOCH when generating man pages
@@ -54,5 +54,5 @@ index 2d940e31fd10..e5e480be3f32 100644
  	dockerCli := command.NewDockerCli(stdin, stdout, stderr, false, nil)
  	cmd := &cobra.Command{Use: "docker"}
 -- 
-2.19.1
+2.21.0
 

bsc1073877-0001-apparmor-clobber-docker-default-profile-on-start.patch

@@ -1,7 +1,7 @@
-From 04f594765577163a26f24d0fe3fc7a2283f1e018 Mon Sep 17 00:00:00 2001
+From 66a84fc12ea9c9a4a9805550b3cd2055862ef1c6 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Fri, 29 Jun 2018 17:59:30 +1000
-Subject: [PATCH 2/2] apparmor: clobber docker-default profile on start
+Subject: [PATCH] apparmor: clobber docker-default profile on start
 
 In the process of making docker-default reloading far less expensive,
 567ef8e7858c ("daemon: switch to 'ensure' workflow for AppArmor
@@ -83,5 +83,5 @@ index a307863017ab..67cd286002bf 100644
  	}
  
 -- 
-2.19.1
+2.21.0
 

bsc1128746-0001-integration-cli-don-t-build-test-images-if-they-alre.patch

@@ -1,4 +1,4 @@
-From 87416bfab7420bb5d0b18269909eb71dcb8632c6 Mon Sep 17 00:00:00 2001
+From c2e035cbcb9a9fb7f89f729bef5b3354891fcdad Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Tue, 12 Mar 2019 18:37:31 +1100
 Subject: [PATCH] integration-cli: don't build -test images if they already
@@ -24,7 +24,7 @@ Signed-off-by: Aleksa Sarai <asarai@suse.de>
  2 files changed, 35 insertions(+), 9 deletions(-)
 
 diff --git a/components/engine/integration-cli/fixtures_linux_daemon_test.go b/components/engine/integration-cli/fixtures_linux_daemon_test.go
-index 2387a9ebee2b..0a770a76a2a9 100644
+index 5c874ec14b0c..ab152f4a9988 100644
 --- a/components/engine/integration-cli/fixtures_linux_daemon_test.go
 +++ b/components/engine/integration-cli/fixtures_linux_daemon_test.go
 @@ -8,7 +8,6 @@ import (
@@ -33,8 +33,8 @@ index 2387a9ebee2b..0a770a76a2a9 100644
  	"strings"
 -	"sync"
  
- 	"github.com/docker/docker/integration-cli/checker"
  	"github.com/docker/docker/internal/test/fixtures/load"
+ 	"github.com/go-check/check"
 @@ -24,17 +23,13 @@ type logT interface {
  	Logf(string, ...interface{})
  }
@@ -73,7 +73,7 @@ index 2387a9ebee2b..0a770a76a2a9 100644
  		ensureNNPTestBuild(c)
  		return
 diff --git a/components/engine/internal/test/environment/environment.go b/components/engine/internal/test/environment/environment.go
-index 74c8e2ce0ad7..e1c8a49ea8cb 100644
+index 5538d2097e9b..763c08ba4845 100644
 --- a/components/engine/internal/test/environment/environment.go
 +++ b/components/engine/internal/test/environment/environment.go
 @@ -8,9 +8,12 @@ import (
@@ -89,8 +89,8 @@ index 74c8e2ce0ad7..e1c8a49ea8cb 100644
  )
  
  // Execution contains information about the current test execution and daemon
-@@ -145,6 +148,26 @@ func (e *Execution) APIClient() client.APIClient {
+@@ -151,6 +154,26 @@ func (e *Execution) IsUserNamespace() bool {
- 	return e.client
+ 	return root != ""
  }
  
 +// HasExistingImage checks whether there is an image with the given reference.

docker-18.09.3_ce.774a1f4eee66.tar.xz

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

docker-18.09.6_ce_481bc7715621.tar.xz

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

docker.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Mon May  6 18:25:14 UTC 2019 - Aleksa Sarai <asarai@suse.com>
+
+- Update to Docker 18.09.6-ce see upstream changelog in the packaged
+  /usr/share/doc/packages/docker/CHANGELOG.md.
+- Rebase patches:
+  * bsc1128746-0001-integration-cli-don-t-build-test-images-if-they-alre.patch
+
+-------------------------------------------------------------------
+Fri May  3 14:02:46 UTC 2019 - Aleksa Sarai <asarai@suse.com>
+
+- Update to Docker 18.09.5-ce see upstream changelog in the packaged
+  /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1128376 boo#1134068
+- Rebase patches:
+  * bsc1001161-0001-oci-include-the-domainname-in-kernel.domainname.patch
+  * bsc1001161-0002-cli-add-a-separate-domainname-flag.patch
+  * bsc1047218-0001-man-obey-SOURCE_DATE_EPOCH-when-generating-man-pages.patch
+  * bsc1128746-0001-integration-cli-don-t-build-test-images-if-they-alre.patch
+  * packaging-0001-revert-Remove-docker-prefix-for-containerd-and-runc-.patch
+  * private-registry-0001-Add-private-registry-mirror-support.patch
+  * secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch
+  * secrets-0002-SUSE-implement-SUSE-container-secrets.patch
+- Updated patch name:
+  + bsc1073877-0001-apparmor-clobber-docker-default-profile-on-start.patch
+  - bsc1073877-0002-apparmor-clobber-docker-default-profile-on-start.patch
+
 -------------------------------------------------------------------
 Fri Mar 22 09:19:28 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
 

docker.spec

@@ -42,24 +42,24 @@
 # helpfully injects into our build environment from the changelog). If you want
 # to generate a new git_commit_epoch, use this:
 #  $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s'
-%define git_version 774a1f4eee66
+%define git_version 481bc7715621
-%define git_commit_epoch 1551333049
+%define git_commit_epoch 1556935084
 
 # These are the git commits required. We verify them against the source to make
 # sure we didn't miss anything important when doing upgrades.
-%define required_containerd e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e
+%define required_containerd bb71b10fd8f58240ca47fbb579b9d1028eea7c84
-%define required_dockerrunc 6635b4f0c6af3810594d2770f662f34ddc15b40d
+%define required_dockerrunc 2b18fe1d885ee5083ef9f0838fee39b62d653e30
-%define required_libnetwork 2cfbf9b1f98162a55829a21cc603c76072a75382
+%define required_libnetwork 872f0a83c98add6cae255c8859e29532febc0039
 
 Name:           %{realname}%{name_suffix}
-Version:        18.09.3_ce
+Version:        18.09.6_ce
 Release:        0
-Summary:        The Linux container runtime
+Summary:        The Moby-project Linux container runtime
 License:        Apache-2.0
 Group:          System/Management
 Url:            http://www.docker.io
 # TODO(VR): check those SOURCE files below
-Source:         %{realname}-%{version}.%{git_version}.tar.xz
+Source:         %{realname}-%{version}_%{git_version}.tar.xz
 Source1:        docker.service
 # bsc#1086185 -- but we only apply this on Kubic.
 Source2:        docker-kubic-service.conf
@@ -78,7 +78,7 @@ Source10:       docker-daemon.json
 Patch200:       secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch
 Patch201:       secrets-0002-SUSE-implement-SUSE-container-secrets.patch
 # SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/37353. bsc#1099277
-Patch401:       bsc1073877-0002-apparmor-clobber-docker-default-profile-on-start.patch
+Patch401:       bsc1073877-0001-apparmor-clobber-docker-default-profile-on-start.patch
 # SUSE-BACKPORT: Backport of https://github.com/docker/cli/pull/1306. boo#1047218
 Patch402:       bsc1047218-0001-man-obey-SOURCE_DATE_EPOCH-when-generating-man-pages.patch
 # SUSE-ISSUE: Revert of https://github.com/docker/docker/pull/37907.
@@ -256,7 +256,7 @@ docker container runtime configuration for kubeadm
 %endif
 
 %prep
-%setup -q -n %{realname}-%{version}.%{git_version}
+%setup -q -n %{realname}-%{version}_%{git_version}
 %if 0%{?is_opensuse}
 # nothing
 %else

packaging-0001-revert-Remove-docker-prefix-for-containerd-and-runc-.patch

@@ -1,4 +1,4 @@
-From 9236191a98a0e9b8aa4ac7da4d4b1c0c196344e2 Mon Sep 17 00:00:00 2001
+From 6d022d4e08225c2fda686fc0d5febecee2efa864 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Thu, 29 Nov 2018 20:53:16 +1100
 Subject: [PATCH] revert "Remove 'docker-' prefix for containerd and runc
@@ -21,10 +21,10 @@ Signed-off-by: Aleksa Sarai <asarai@suse.de>
  7 files changed, 25 insertions(+), 35 deletions(-)
 
 diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml
-index f58a64f29ea3..d275f2ff49eb 100644
+index ca9d29e021de..082e5783ff1f 100644
 --- a/components/engine/api/swagger.yaml
 +++ b/components/engine/api/swagger.yaml
-@@ -3852,10 +3852,10 @@ definitions:
+@@ -3866,10 +3866,10 @@ definitions:
            $ref: "#/definitions/Runtime"
          default:
            runc:
@@ -38,10 +38,10 @@ index f58a64f29ea3..d275f2ff49eb 100644
              path: "/go/bin/runc"
            custom:
 diff --git a/components/engine/builder/builder-next/executor_unix.go b/components/engine/builder/builder-next/executor_unix.go
-index b3ea33c05c71..94d8bb766045 100644
+index 3a11f8588144..ce4d2d937f9f 100644
 --- a/components/engine/builder/builder-next/executor_unix.go
 +++ b/components/engine/builder/builder-next/executor_unix.go
-@@ -27,7 +27,7 @@ func newExecutor(root, cgroupParent string, net libnetwork.NetworkController) (e
+@@ -28,7 +28,7 @@ func newExecutor(root, cgroupParent string, net libnetwork.NetworkController) (e
  	}
  	return runcexecutor.New(runcexecutor.Opt{
  		Root:                filepath.Join(root, "executor"),
@@ -111,7 +111,7 @@ index 839537316af4..05922e6418d0 100644
 -	return err == nil
 -}
 diff --git a/components/engine/daemon/daemon_unix.go b/components/engine/daemon/daemon_unix.go
-index b69eede21c44..77adba94a468 100644
+index 5234201c828f..c40d11bc85c2 100644
 --- a/components/engine/daemon/daemon_unix.go
 +++ b/components/engine/daemon/daemon_unix.go
 @@ -54,11 +54,11 @@ import (
@@ -138,7 +138,7 @@ index b69eede21c44..77adba94a468 100644
  
  type containerGetter interface {
 diff --git a/components/engine/libcontainerd/supervisor/remote_daemon.go b/components/engine/libcontainerd/supervisor/remote_daemon.go
-index 095300f753e9..1dcfbe176b0d 100644
+index eb9a2bdd8198..309f50f26bb2 100644
 --- a/components/engine/libcontainerd/supervisor/remote_daemon.go
 +++ b/components/engine/libcontainerd/supervisor/remote_daemon.go
 @@ -27,8 +27,8 @@ const (
@@ -183,5 +183,5 @@ index 9b254ef58a0a..bcdc9529e0f7 100644
  
  func (r *remote) setDefaults() {
 -- 
-2.19.2
+2.21.0
 

private-registry-0001-Add-private-registry-mirror-support.patch

@@ -1,4 +1,4 @@
-From a2d285ef5de9537fe2dbf14c4671625aa3035b98 Mon Sep 17 00:00:00 2001
+From 2a00f998e1e081a9f72f0ba81403dceea252c6a1 Mon Sep 17 00:00:00 2001
 From: Valentin Rothberg <vrothberg@suse.com>
 Date: Mon, 2 Jul 2018 13:37:34 +0200
 Subject: [PATCH] Add private-registry mirror support
@@ -1160,5 +1160,5 @@ index 3a56dc91145a..9de221cf2aa0 100644
  
  	endpoints = []APIEndpoint{
 -- 
-2.19.1
+2.21.0
 

secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch

@@ -1,4 +1,4 @@
-From 4eba91df3257644105ef344949705651507eb2bd Mon Sep 17 00:00:00 2001
+From 6603582112f42cd00b84d62a5412f2380e55d7e3 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Wed, 8 Mar 2017 12:41:54 +1100
 Subject: [PATCH 1/2] daemon: allow directory creation in /run/secrets
@@ -14,7 +14,7 @@ Signed-off-by: Aleksa Sarai <asarai@suse.de>
  1 file changed, 21 insertions(+), 3 deletions(-)
 
 diff --git a/components/engine/daemon/container_operations_unix.go b/components/engine/daemon/container_operations_unix.go
-index 9953c7f3fddc..e8f6784ca19a 100644
+index c0aab7234269..8d8b13d26cff 100644
 --- a/components/engine/daemon/container_operations_unix.go
 +++ b/components/engine/daemon/container_operations_unix.go
 @@ -3,6 +3,7 @@
@@ -70,5 +70,5 @@ index 9953c7f3fddc..e8f6784ca19a 100644
  			return errors.Wrap(err, "error setting ownership for secret")
  		}
 -- 
-2.19.2
+2.21.0
 

secrets-0002-SUSE-implement-SUSE-container-secrets.patch

@@ -1,4 +1,4 @@
-From 229a891b45b996a2cd10f5a71541d124e884556e Mon Sep 17 00:00:00 2001
+From 3eabc382912eeb475013b5514412968dfa300d63 Mon Sep 17 00:00:00 2001
 From: Aleksa Sarai <asarai@suse.de>
 Date: Wed, 8 Mar 2017 11:43:29 +1100
 Subject: [PATCH 2/2] SUSE: implement SUSE container secrets
@@ -19,7 +19,7 @@ Signed-off-by: Aleksa Sarai <asarai@suse.de>
  create mode 100644 components/engine/daemon/suse_secrets.go
 
 diff --git a/components/engine/daemon/start.go b/components/engine/daemon/start.go
-index c00bd9ceb22b..aa705888df39 100644
+index e2265a4faeca..31b60e5621c6 100644
 --- a/components/engine/daemon/start.go
 +++ b/components/engine/daemon/start.go
 @@ -151,6 +151,11 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
@@ -437,5 +437,5 @@ index 000000000000..087c877015a7
 +	return nil
 +}
 -- 
-2.19.2
+2.21.0