Accepting request 476967 from home:cyphar:containers
- Add patch to fix TestDaemonCommand failure in %check. This is an upstream bug, and has an upstream PR to fix it https://github.com/docker/docker/pull/31549. + pr31549-cmd-docker-fix-TestDaemonCommand.patch OBS-URL: https://build.opensuse.org/request/show/476967 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=170
This commit is contained in:
Jordi Massaguer
Git OBS Bridge
parent
d94576af79
commit
bfed92d82d
@ -1,9 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 5 04:54:52 UTC 2017 - asarai@suse.com
|
||||
|
||||
- Add patch to fix TestDaemonCommand failure in %check. This is an upstream
|
||||
bug, and has an upstream PR to fix it https://github.com/docker/docker/pull/31549.
|
||||
+ pr31549-cmd-docker-fix-TestDaemonCommand.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
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.
|
||||
@ -21,20 +28,20 @@ Thu Jan 26 15:43:38 UTC 2017 - jmassaguerpla@suse.com
|
||||
|
||||
- provide the oci runtime so that containers which were using an old
|
||||
runtime option, when started on the new docker version, the runtime
|
||||
is changed to the new one. fix bsc#1020806 bsc#1016992
|
||||
is changed to the new one. fix bsc#1020806 bsc#1016992
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 13 13:56:15 UTC 2017 - jmassaguerpla@suse.com
|
||||
|
||||
- fix CVE-2016-9962 bsc#1012568 . Fix it by updating to 1.12.6
|
||||
plus an extra commit to fix liverestore:
|
||||
https://github.com/docker/docker/commit/97cd32a6a9076306baa637a29bba84c3f1f3d218
|
||||
https://github.com/docker/docker/commit/97cd32a6a9076306baa637a29bba84c3f1f3d218
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 11 12:47:16 UTC 2017 - jmassaguerpla@suse.com
|
||||
|
||||
- add "a wait" when starting docker service to fix
|
||||
bsc#1019251
|
||||
bsc#1019251
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 20 12:41:33 UTC 2016 - normand@linux.vnet.ibm.com
|
||||
|
||||
@ -59,7 +59,7 @@ Source7: README_SUSE.md
|
||||
Source8: docker-audit.rules
|
||||
Source9: docker-update-message.txt
|
||||
Source10: tests.sh
|
||||
Source11: docker_service_helper.sh
|
||||
Source11: docker_service_helper.sh
|
||||
# Fixes for architecture-specific issues (gcc-go).
|
||||
Patch100: gcc-go-patches.patch
|
||||
Patch102: netlink_netns_powerpc.patch
|
||||
@ -70,6 +70,7 @@ Patch103: boltdb_bolt_add_brokenUnaligned.patch
|
||||
# branch in http://github.com/suse/docker.mirror.
|
||||
Patch200: docker-mount-secrets.patch
|
||||
Patch300: integration-cli-fix-TestInfoEnsureSucceeds.patch
|
||||
Patch301: pr31549-cmd-docker-fix-TestDaemonCommand.patch
|
||||
BuildRequires: audit
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: ca-certificates
|
||||
@ -180,6 +181,7 @@ Test package for docker. It contains the source code and the tests.
|
||||
%patch103 -p1
|
||||
%endif
|
||||
%patch300 -p1
|
||||
%patch301 -p1
|
||||
cp %{SOURCE7} .
|
||||
cp %{SOURCE10} .
|
||||
|
||||
|
||||
49
pr31549-cmd-docker-fix-TestDaemonCommand.patch
Normal file
49
pr31549-cmd-docker-fix-TestDaemonCommand.patch
Normal file
@ -0,0 +1,49 @@
|
||||
From dd7159060f60ea04007c069df189a29fda2c655f Mon Sep 17 00:00:00 2001
|
||||
From: Aleksa Sarai <asarai@suse.de>
|
||||
Date: Sun, 5 Mar 2017 15:25:11 +1100
|
||||
Subject: [PATCH] cmd: docker: fix TestDaemonCommand
|
||||
|
||||
In more recent versions of Cobra, `--help` parsing is done before
|
||||
anything else resulting in TestDaemonCommand not actually passing. I'm
|
||||
actually unsure if this test ever passed since it appears that !daemon
|
||||
is not being run as part of the test suite.
|
||||
|
||||
Signed-off-by: Aleksa Sarai <asarai@suse.de>
|
||||
---
|
||||
cmd/docker/daemon_none.go | 6 ++++--
|
||||
cmd/docker/daemon_none_test.go | 2 +-
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmd/docker/daemon_none.go b/cmd/docker/daemon_none.go
|
||||
index 65f9f37be22f..6fbd00012526 100644
|
||||
--- a/cmd/docker/daemon_none.go
|
||||
+++ b/cmd/docker/daemon_none.go
|
||||
@@ -12,8 +12,10 @@ import (
|
||||
|
||||
func newDaemonCommand() *cobra.Command {
|
||||
return &cobra.Command{
|
||||
- Use: "daemon",
|
||||
- Hidden: true,
|
||||
+ Use: "daemon",
|
||||
+ Hidden: true,
|
||||
+ Args: cobra.ArbitraryArgs,
|
||||
+ DisableFlagParsing: true,
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
return runDaemon()
|
||||
},
|
||||
diff --git a/cmd/docker/daemon_none_test.go b/cmd/docker/daemon_none_test.go
|
||||
index 32032fe1b344..bd42add98696 100644
|
||||
--- a/cmd/docker/daemon_none_test.go
|
||||
+++ b/cmd/docker/daemon_none_test.go
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
|
||||
func TestDaemonCommand(t *testing.T) {
|
||||
cmd := newDaemonCommand()
|
||||
- cmd.SetArgs([]string{"--help"})
|
||||
+ cmd.SetArgs([]string{"--version"})
|
||||
err := cmd.Execute()
|
||||
|
||||
assert.Error(t, err, "Please run `dockerd`")
|
||||
--
|
||||
2.12.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user