From 5690a0041e829ed33f40a775ed2b4f4a6b9ccbb281f8b7b67426194fa292d3cb Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 6 May 2019 18:41:55 +0000 Subject: [PATCH] Accepting request 701146 from home:cyphar:docker - 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 OBS-URL: https://build.opensuse.org/request/show/701146 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=307 --- _service | 4 ++-- ...on-cli-don-t-build-test-images-if-they-alre.patch | 12 ++++++------ docker-18.09.5_ce_e8ff056dbcfa.tar.xz | 3 --- docker-18.09.6_ce_481bc7715621.tar.xz | 3 +++ docker.changes | 8 ++++++++ docker.spec | 8 ++++---- 6 files changed, 23 insertions(+), 15 deletions(-) delete mode 100644 docker-18.09.5_ce_e8ff056dbcfa.tar.xz create mode 100644 docker-18.09.6_ce_481bc7715621.tar.xz diff --git a/_service b/_service index fda9ef4..b7035e7 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/docker/docker-ce.git git .git - 18.09.5_ce_%h - v18.09.5 + 18.09.6_ce_%h + v18.09.6 docker diff --git a/bsc1128746-0001-integration-cli-don-t-build-test-images-if-they-alre.patch b/bsc1128746-0001-integration-cli-don-t-build-test-images-if-they-alre.patch index da9918c..7d80317 100644 --- a/bsc1128746-0001-integration-cli-don-t-build-test-images-if-they-alre.patch +++ b/bsc1128746-0001-integration-cli-don-t-build-test-images-if-they-alre.patch @@ -1,4 +1,4 @@ -From 3f1f39de956ff57965f586458b9cee95dd6dd75b Mon Sep 17 00:00:00 2001 +From c2e035cbcb9a9fb7f89f729bef5b3354891fcdad Mon Sep 17 00:00:00 2001 From: Aleksa Sarai 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 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 { - return e.client +@@ -151,6 +154,26 @@ func (e *Execution) IsUserNamespace() bool { + return root != "" } +// HasExistingImage checks whether there is an image with the given reference. diff --git a/docker-18.09.5_ce_e8ff056dbcfa.tar.xz b/docker-18.09.5_ce_e8ff056dbcfa.tar.xz deleted file mode 100644 index 261cfad..0000000 --- a/docker-18.09.5_ce_e8ff056dbcfa.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63be9ea940352b3bd78f6fc52b12a43320677783b28d24a5f547ec508f19284b -size 9338644 diff --git a/docker-18.09.6_ce_481bc7715621.tar.xz b/docker-18.09.6_ce_481bc7715621.tar.xz new file mode 100644 index 0000000..bf7384e --- /dev/null +++ b/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 diff --git a/docker.changes b/docker.changes index c042f62..b122d1f 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon May 6 18:25:14 UTC 2019 - Aleksa Sarai + +- 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 diff --git a/docker.spec b/docker.spec index a2e6d62..351b10e 100644 --- a/docker.spec +++ b/docker.spec @@ -42,17 +42,17 @@ # 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 e8ff056dbcfa -%define git_commit_epoch 1554940059 +%define git_version 481bc7715621 +%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 bb71b10fd8f58240ca47fbb579b9d1028eea7c84 %define required_dockerrunc 2b18fe1d885ee5083ef9f0838fee39b62d653e30 -%define required_libnetwork 4725f2163fb214a6312f3beae5991f838ec36326 +%define required_libnetwork 872f0a83c98add6cae255c8859e29532febc0039 Name: %{realname}%{name_suffix} -Version: 18.09.5_ce +Version: 18.09.6_ce Release: 0 Summary: The Moby-project Linux container runtime License: Apache-2.0