Hello community, here is the log from the commit of package docker-kubic for openSUSE:Factory checked in at 2018-02-18 11:42:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker-kubic (Old) and /work/SRC/openSUSE:Factory/.docker-kubic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-kubic" Sun Feb 18 11:42:01 2018 rev:4 rq:576050 version:17.09.1_ce Changes: -------- --- /work/SRC/openSUSE:Factory/docker-kubic/docker-kubic.changes 2018-02-12 14:46:19.444303455 +0100 +++ /work/SRC/openSUSE:Factory/.docker-kubic.new/docker-kubic.changes 2018-02-18 11:42:01.486332170 +0100 @@ -1,0 +2,13 @@ +Tue Feb 13 10:45:58 UTC 2018 - asa...@suse.com + +- Update patches to be sourced from https://github.com/suse/docker-ce (which + are based on the upstream docker/docker-ce repo). The reason for this change + (though it is functionally identical to the old patches) is so that public + patch maintenance is much simpler. + * bsc1021227-0001-pkg-devmapper-dynamically-load-dm_task_deferred_remo.patch + * bsc1055676-0001-daemon-oci-obey-CL_UNPRIVILEGED-for-user-namespaced-.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 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker-kubic.spec ++++++ --- /var/tmp/diff_new_pack.6jIikB/_old 2018-02-18 11:42:02.506295556 +0100 +++ /var/tmp/diff_new_pack.6jIikB/_new 2018-02-18 11:42:02.506295556 +0100 @@ -209,15 +209,15 @@ # nothing %else # PATCH-SUSE: Secrets patches. -%patch200 -p1 -d components/engine -%patch201 -p1 -d components/engine +%patch200 -p1 +%patch201 -p1 %endif # bsc#1055676 -%patch400 -p1 -d components/engine +%patch400 -p1 # bsc#1021227 bsc#1029320 bsc#1058173 -%patch401 -p1 -d components/engine +%patch401 -p1 # PATCH-SUSE: Mirror patch. -%patch500 -p1 -d components/engine +%patch500 -p1 cp %{SOURCE7} . cp %{SOURCE9} . ++++++ bsc1021227-0001-pkg-devmapper-dynamically-load-dm_task_deferred_remo.patch ++++++ --- /var/tmp/diff_new_pack.6jIikB/_old 2018-02-18 11:42:02.594292397 +0100 +++ /var/tmp/diff_new_pack.6jIikB/_new 2018-02-18 11:42:02.594292397 +0100 @@ -1,4 +1,4 @@ -From b492588a54b8efa1fba1de700cb3e0ad3fe665d9 Mon Sep 17 00:00:00 2001 +From e57d7270deb50c31ac1f732d8f28812e5b809062 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Thu, 16 Nov 2017 17:09:16 +1100 Subject: [PATCH] pkg: devmapper: dynamically load dm_task_deferred_remove @@ -19,18 +19,18 @@ SUSE-Bugs: bsc#1021227 bsc#1029320 bsc#1058173 Signed-off-by: Aleksa Sarai <asa...@suse.de> --- - hack/make.sh | 12 +- + components/engine/hack/make.sh | 12 +- ...> devmapper_wrapper_dynamic_deferred_remove.go} | 10 +- ...mapper_wrapper_dynamic_dlsym_deferred_remove.go | 128 +++++++++++++++++++++ .../devmapper_wrapper_no_deferred_remove.go | 6 +- 4 files changed, 149 insertions(+), 7 deletions(-) - rename pkg/devicemapper/{devmapper_wrapper_deferred_remove.go => devmapper_wrapper_dynamic_deferred_remove.go} (78%) - create mode 100644 pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go + rename components/engine/pkg/devicemapper/{devmapper_wrapper_deferred_remove.go => devmapper_wrapper_dynamic_deferred_remove.go} (78%) + create mode 100644 components/engine/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go -diff --git a/hack/make.sh b/hack/make.sh -index bc18c066b66c..6e94824ad557 100755 ---- a/hack/make.sh -+++ b/hack/make.sh +diff --git a/components/engine/hack/make.sh b/components/engine/hack/make.sh +index 58e0d8cd628a..3b78ddef30b0 100755 +--- a/components/engine/hack/make.sh ++++ b/components/engine/hack/make.sh @@ -112,6 +112,12 @@ if [ ! "$GOPATH" ]; then exit 1 fi @@ -61,13 +61,13 @@ fi # Use these flags when compiling the tests and final binary -diff --git a/pkg/devicemapper/devmapper_wrapper_deferred_remove.go b/pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go +diff --git a/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go b/components/engine/pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go similarity index 78% -rename from pkg/devicemapper/devmapper_wrapper_deferred_remove.go -rename to pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go +rename from components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go +rename to components/engine/pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go index 7f793c270868..bf57371ff4cf 100644 ---- a/pkg/devicemapper/devmapper_wrapper_deferred_remove.go -+++ b/pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go +--- a/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go ++++ b/components/engine/pkg/devicemapper/devmapper_wrapper_dynamic_deferred_remove.go @@ -1,11 +1,15 @@ -// +build linux,cgo,!libdm_no_deferred_remove +// +build linux,cgo,!static_build @@ -87,11 +87,11 @@ const LibraryDeferredRemovalSupport = true func dmTaskDeferredRemoveFct(task *cdmTask) int { -diff --git a/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go b/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go +diff --git a/components/engine/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go b/components/engine/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go new file mode 100644 index 000000000000..5dfb369f1ff8 --- /dev/null -+++ b/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go ++++ b/components/engine/pkg/devicemapper/devmapper_wrapper_dynamic_dlsym_deferred_remove.go @@ -0,0 +1,128 @@ +// +build linux,cgo,!static_build +// +build libdm_dlsym_deferred_remove,!libdm_no_deferred_remove @@ -221,10 +221,10 @@ + }() + return int(C.dm_task_get_info((*C.struct_dm_task)(task), (*C.struct_dm_info)(unsafe.Pointer(&Cinfo)))) +} -diff --git a/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go b/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go +diff --git a/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go b/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go index a880fec8c499..80b034b3ff17 100644 ---- a/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go -+++ b/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go +--- a/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go ++++ b/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go @@ -1,8 +1,10 @@ -// +build linux,cgo,libdm_no_deferred_remove +// +build linux,cgo @@ -239,5 +239,5 @@ func dmTaskDeferredRemoveFct(task *cdmTask) int { -- -2.15.1 +2.16.1 ++++++ bsc1055676-0001-daemon-oci-obey-CL_UNPRIVILEGED-for-user-namespaced-.patch ++++++ --- /var/tmp/diff_new_pack.6jIikB/_old 2018-02-18 11:42:02.602292110 +0100 +++ /var/tmp/diff_new_pack.6jIikB/_new 2018-02-18 11:42:02.602292110 +0100 @@ -1,4 +1,4 @@ -From a24b98c0fc45d640b4eed8105033b313b8145e35 Mon Sep 17 00:00:00 2001 +From ff7b94c76f343931463b5916fb3fbd2610869a1a Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Sun, 15 Oct 2017 17:06:20 +1100 Subject: [PATCH] daemon: oci: obey CL_UNPRIVILEGED for user namespaced daemon @@ -14,17 +14,16 @@ namespaces enabled. SUSE-Bug: https://bugzilla.suse.com/show_bug.cgi?id=1055676 -SUSE-Backport: https://github.com/moby/moby/pull/35205 Signed-off-by: Aleksa Sarai <asa...@suse.de> --- - daemon/oci_linux.go | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + components/engine/daemon/oci_linux.go | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) -diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go -index 0f8a392c2621..89ac627ff090 100644 ---- a/daemon/oci_linux.go -+++ b/daemon/oci_linux.go -@@ -26,6 +26,7 @@ import ( +diff --git a/components/engine/daemon/oci_linux.go b/components/engine/daemon/oci_linux.go +index 6917b4841429..936cb8f998ca 100644 +--- a/components/engine/daemon/oci_linux.go ++++ b/components/engine/daemon/oci_linux.go +@@ -27,6 +27,7 @@ import ( "github.com/opencontainers/runc/libcontainer/user" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" @@ -71,7 +70,7 @@ var ( mountPropagationMap = map[string]int{ "private": mount.PRIVATE, -@@ -575,6 +608,19 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c +@@ -586,6 +619,19 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c opts = append(opts, mountPropagationReverseMap[pFlag]) } @@ -92,5 +91,5 @@ s.Mounts = append(s.Mounts, mt) } -- -2.15.0 +2.16.1 ++++++ private-registry-0001-Add-private-registry-mirror-support.patch ++++++ --- /var/tmp/diff_new_pack.6jIikB/_old 2018-02-18 11:42:02.654290243 +0100 +++ /var/tmp/diff_new_pack.6jIikB/_new 2018-02-18 11:42:02.658290100 +0100 @@ -1,4 +1,4 @@ -From 53d040ab432bd64b4def2e55836a5a46eacddc00 Mon Sep 17 00:00:00 2001 +From b3fcbddfa87f116dc4efecd8aea3803872153246 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg <vrothb...@suse.com> Date: Tue, 23 Jan 2018 10:41:31 +0100 Subject: [PATCH] Add private-registry mirror support @@ -63,27 +63,27 @@ Signed-off-by: Flavio Castelli <fcaste...@suse.com> Signed-off-by: Valentin Rothberg <vrothb...@suse.com> --- - api/types/registry/registry.go | 144 +++++++++++++++++++++ - daemon/config/config.go | 4 + - daemon/image_pull.go | 2 +- - daemon/reload.go | 33 +++++ - daemon/reload_test.go | 93 +++++++++++++ - distribution/pull.go | 2 +- - distribution/pull_v2.go | 2 +- - distribution/push.go | 2 +- - integration-cli/daemon/daemon.go | 6 +- + components/engine/api/types/registry/registry.go | 144 +++++++++++++++++++++ + components/engine/daemon/config/config.go | 4 + + components/engine/daemon/image_pull.go | 2 +- + components/engine/daemon/reload.go | 33 +++++ + components/engine/daemon/reload_test.go | 93 +++++++++++++ + components/engine/distribution/pull.go | 2 +- + components/engine/distribution/pull_v2.go | 2 +- + components/engine/distribution/push.go | 2 +- + components/engine/integration-cli/daemon/daemon.go | 6 +- .../engine/integration-cli/docker_api_auth_test.go | 2 +- - registry/config.go | 131 ++++++++++++++++++- - registry/config_test.go | 138 ++++++++++++++++++++ - registry/registry_test.go | 102 +++++++++++++-- - registry/service.go | 56 +++++--- - registry/service_v2.go | 69 +++++++--- + components/engine/registry/config.go | 131 ++++++++++++++++++- + components/engine/registry/config_test.go | 138 ++++++++++++++++++++ + components/engine/registry/registry_test.go | 102 +++++++++++++-- + components/engine/registry/service.go | 56 +++++--- + components/engine/registry/service_v2.go | 69 +++++++--- 15 files changed, 728 insertions(+), 58 deletions(-) -diff --git a/api/types/registry/registry.go b/api/types/registry/registry.go +diff --git a/components/engine/api/types/registry/registry.go b/components/engine/api/types/registry/registry.go index b98a943a1323..669cc415a6a4 100644 ---- a/api/types/registry/registry.go -+++ b/api/types/registry/registry.go +--- a/components/engine/api/types/registry/registry.go ++++ b/components/engine/api/types/registry/registry.go @@ -2,7 +2,10 @@ package registry import ( @@ -247,10 +247,10 @@ +func (r *RegURL) String() string { + return r.rURL.String() +} -diff --git a/daemon/config/config.go b/daemon/config/config.go +diff --git a/components/engine/daemon/config/config.go b/components/engine/daemon/config/config.go index 501c07af7667..7497fa4ae43e 100644 ---- a/daemon/config/config.go -+++ b/daemon/config/config.go +--- a/components/engine/daemon/config/config.go ++++ b/components/engine/daemon/config/config.go @@ -404,6 +404,10 @@ func findConfigurationConflicts(config map[string]interface{}, flags *pflag.Flag // 1. Search keys from the file that we don't recognize as flags. unknownKeys := make(map[string]interface{}) @@ -262,10 +262,10 @@ if flag := flags.Lookup(key); flag == nil { unknownKeys[key] = value } -diff --git a/daemon/image_pull.go b/daemon/image_pull.go +diff --git a/components/engine/daemon/image_pull.go b/components/engine/daemon/image_pull.go index aef1876bad25..33bd9a14898d 100644 ---- a/daemon/image_pull.go -+++ b/daemon/image_pull.go +--- a/components/engine/daemon/image_pull.go ++++ b/components/engine/daemon/image_pull.go @@ -100,7 +100,7 @@ func (daemon *Daemon) GetRepository(ctx context.Context, ref reference.Named, au } @@ -275,10 +275,10 @@ if err != nil { return nil, false, err } -diff --git a/daemon/reload.go b/daemon/reload.go +diff --git a/components/engine/daemon/reload.go b/components/engine/daemon/reload.go index a6674ec95190..481c0313873f 100644 ---- a/daemon/reload.go -+++ b/daemon/reload.go +--- a/components/engine/daemon/reload.go ++++ b/components/engine/daemon/reload.go @@ -22,8 +22,14 @@ import ( // - Daemon labels // - Insecure registries @@ -335,10 +335,10 @@ // reloadLiveRestore updates configuration with live retore option // and updates the passed attributes func (daemon *Daemon) reloadLiveRestore(conf *config.Config, attributes map[string]string) error { -diff --git a/daemon/reload_test.go b/daemon/reload_test.go +diff --git a/components/engine/daemon/reload_test.go b/components/engine/daemon/reload_test.go index bf11b6bd56fd..c1286283d524 100644 ---- a/daemon/reload_test.go -+++ b/daemon/reload_test.go +--- a/components/engine/daemon/reload_test.go ++++ b/components/engine/daemon/reload_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" @@ -446,10 +446,10 @@ func TestDaemonReloadInsecureRegistries(t *testing.T) { daemon := &Daemon{} // initialize daemon with existing insecure registries: "127.0.0.0/8", "10.10.1.11:5000", "10.10.1.22:5000" -diff --git a/distribution/pull.go b/distribution/pull.go +diff --git a/components/engine/distribution/pull.go b/components/engine/distribution/pull.go index 68144df79449..f71b0d939e2f 100644 ---- a/distribution/pull.go -+++ b/distribution/pull.go +--- a/components/engine/distribution/pull.go ++++ b/components/engine/distribution/pull.go @@ -62,7 +62,7 @@ func Pull(ctx context.Context, ref reference.Named, imagePullConfig *ImagePullCo return err } @@ -459,10 +459,10 @@ if err != nil { return err } -diff --git a/distribution/pull_v2.go b/distribution/pull_v2.go +diff --git a/components/engine/distribution/pull_v2.go b/components/engine/distribution/pull_v2.go index d1d5f5c8b8e0..1a12ccf361be 100644 ---- a/distribution/pull_v2.go -+++ b/distribution/pull_v2.go +--- a/components/engine/distribution/pull_v2.go ++++ b/components/engine/distribution/pull_v2.go @@ -376,7 +376,7 @@ func (p *v2Puller) pullV2Tag(ctx context.Context, ref reference.Named) (tagUpdat // the other side speaks the v2 protocol. p.confirmedV2 = true @@ -472,10 +472,10 @@ progress.Message(p.config.ProgressOutput, tagOrDigest, "Pulling from "+reference.FamiliarName(p.repo.Named())) var ( -diff --git a/distribution/push.go b/distribution/push.go +diff --git a/components/engine/distribution/push.go b/components/engine/distribution/push.go index 25b49faf5eb9..82cc2065c8ce 100644 ---- a/distribution/push.go -+++ b/distribution/push.go +--- a/components/engine/distribution/push.go ++++ b/components/engine/distribution/push.go @@ -64,7 +64,7 @@ func Push(ctx context.Context, ref reference.Named, imagePushConfig *ImagePushCo return err } @@ -485,10 +485,10 @@ if err != nil { return err } -diff --git a/integration-cli/daemon/daemon.go b/integration-cli/daemon/daemon.go +diff --git a/components/engine/integration-cli/daemon/daemon.go b/components/engine/integration-cli/daemon/daemon.go index 06bf504fa631..bf31f1da5463 100644 ---- a/integration-cli/daemon/daemon.go -+++ b/integration-cli/daemon/daemon.go +--- a/components/engine/integration-cli/daemon/daemon.go ++++ b/components/engine/integration-cli/daemon/daemon.go @@ -426,6 +426,7 @@ out1: for { select { @@ -516,10 +516,10 @@ return err } -diff --git a/integration-cli/docker_api_auth_test.go b/integration-cli/docker_api_auth_test.go +diff --git a/components/engine/integration-cli/docker_api_auth_test.go b/components/engine/integration-cli/docker_api_auth_test.go index a1f7a098cdaf..2612a5646010 100644 ---- a/integration-cli/docker_api_auth_test.go -+++ b/integration-cli/docker_api_auth_test.go +--- a/components/engine/integration-cli/docker_api_auth_test.go ++++ b/components/engine/integration-cli/docker_api_auth_test.go @@ -20,6 +20,6 @@ func (s *DockerSuite) TestAuthAPI(c *check.C) { defer cli.Close() @@ -528,10 +528,10 @@ + expected := "Get https://index.docker.io/v2/: unauthorized: incorrect username or password" c.Assert(err.Error(), checker.Contains, expected) } -diff --git a/registry/config.go b/registry/config.go +diff --git a/components/engine/registry/config.go b/components/engine/registry/config.go index 70efb4330f6a..02f29264c7ef 100644 ---- a/registry/config.go -+++ b/registry/config.go +--- a/components/engine/registry/config.go ++++ b/components/engine/registry/config.go @@ -14,7 +14,7 @@ import ( "github.com/sirupsen/logrus" ) @@ -711,10 +711,10 @@ registries = append(registries, "127.0.0.0/8") // Store original InsecureRegistryCIDRs and IndexConfigs -diff --git a/registry/config_test.go b/registry/config_test.go +diff --git a/components/engine/registry/config_test.go b/components/engine/registry/config_test.go index 8cb7e5a54344..baa0507c59a3 100644 ---- a/registry/config_test.go -+++ b/registry/config_test.go +--- a/components/engine/registry/config_test.go ++++ b/components/engine/registry/config_test.go @@ -5,8 +5,146 @@ import ( "sort" "strings" @@ -862,10 +862,10 @@ func TestLoadAllowNondistributableArtifacts(t *testing.T) { testCases := []struct { registries []string -diff --git a/registry/registry_test.go b/registry/registry_test.go +diff --git a/components/engine/registry/registry_test.go b/components/engine/registry/registry_test.go index d89c46c2c013..445eba42d781 100644 ---- a/registry/registry_test.go -+++ b/registry/registry_test.go +--- a/components/engine/registry/registry_test.go ++++ b/components/engine/registry/registry_test.go @@ -655,35 +655,117 @@ func TestNewIndexInfo(t *testing.T) { } @@ -994,10 +994,10 @@ } func TestPushRegistryTag(t *testing.T) { -diff --git a/registry/service.go b/registry/service.go +diff --git a/components/engine/registry/service.go b/components/engine/registry/service.go index d36b11f0e1d6..7fec13eb486b 100644 ---- a/registry/service.go -+++ b/registry/service.go +--- a/components/engine/registry/service.go ++++ b/components/engine/registry/service.go @@ -9,7 +9,7 @@ import ( "golang.org/x/net/context" @@ -1131,10 +1131,10 @@ legacyEndpoints, err := s.lookupV1Endpoints(hostname) if err != nil { return nil, err -diff --git a/registry/service_v2.go b/registry/service_v2.go +diff --git a/components/engine/registry/service_v2.go b/components/engine/registry/service_v2.go index 68466f823f41..53fe76222180 100644 ---- a/registry/service_v2.go -+++ b/registry/service_v2.go +--- a/components/engine/registry/service_v2.go ++++ b/components/engine/registry/service_v2.go @@ -1,46 +1,75 @@ package registry @@ -1240,5 +1240,5 @@ endpoints = []APIEndpoint{ -- -2.13.6 +2.16.1 ++++++ secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch ++++++ --- /var/tmp/diff_new_pack.6jIikB/_old 2018-02-18 11:42:02.666289812 +0100 +++ /var/tmp/diff_new_pack.6jIikB/_new 2018-02-18 11:42:02.666289812 +0100 @@ -1,4 +1,4 @@ -From 5022c3554723040682444e324cd26ec8e2500131 Mon Sep 17 00:00:00 2001 +From c607825b73e5f850b3804a10e9f3c8684cb29d16 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Wed, 8 Mar 2017 12:41:54 +1100 Subject: [PATCH 1/2] daemon: allow directory creation in /run/secrets @@ -10,13 +10,13 @@ Signed-off-by: Antonio Murdaca <run...@redhat.com> Signed-off-by: Aleksa Sarai <asa...@suse.de> --- - daemon/container_operations_unix.go | 24 +++++++++++++++++++++--- + .../engine/daemon/container_operations_unix.go | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) -diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go +diff --git a/components/engine/daemon/container_operations_unix.go b/components/engine/daemon/container_operations_unix.go index 954c194ea836..3ef1e0262edc 100644 ---- a/daemon/container_operations_unix.go -+++ b/daemon/container_operations_unix.go +--- a/components/engine/daemon/container_operations_unix.go ++++ b/components/engine/daemon/container_operations_unix.go @@ -3,6 +3,7 @@ package daemon @@ -70,5 +70,5 @@ return errors.Wrap(err, "error setting ownership for secret") } -- -2.15.1 +2.16.1 ++++++ secrets-0002-SUSE-implement-SUSE-container-secrets.patch ++++++ --- /var/tmp/diff_new_pack.6jIikB/_old 2018-02-18 11:42:02.678289382 +0100 +++ /var/tmp/diff_new_pack.6jIikB/_new 2018-02-18 11:42:02.678289382 +0100 @@ -1,4 +1,4 @@ -From a84aa9152b50ea1fd73a7d09246ac056534d0e48 Mon Sep 17 00:00:00 2001 +From 3a7cd305f75fabc49460066e5452458a524ead5c Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asa...@suse.de> Date: Wed, 8 Mar 2017 11:43:29 +1100 Subject: [PATCH 2/2] SUSE: implement SUSE container secrets @@ -13,15 +13,15 @@ SUSE-Bugs: bsc#1057743 bsc#1055676 bsc#1030702 Signed-off-by: Aleksa Sarai <asa...@suse.de> --- - daemon/start.go | 5 + - daemon/suse_secrets.go | 391 +++++++++++++++++++++++++++++++++++++++++++++++++ + components/engine/daemon/start.go | 5 + + components/engine/daemon/suse_secrets.go | 391 +++++++++++++++++++++++++++++++ 2 files changed, 396 insertions(+) - create mode 100644 daemon/suse_secrets.go + create mode 100644 components/engine/daemon/suse_secrets.go -diff --git a/daemon/start.go b/daemon/start.go -index de32a649d7ed..2b6137d315e9 100644 ---- a/daemon/start.go -+++ b/daemon/start.go +diff --git a/components/engine/daemon/start.go b/components/engine/daemon/start.go +index 55438cf2c45f..7dfa6cd1d055 100644 +--- a/components/engine/daemon/start.go ++++ b/components/engine/daemon/start.go @@ -147,6 +147,11 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint return err } @@ -34,11 +34,11 @@ spec, err := daemon.createSpec(container) if err != nil { return systemError{err} -diff --git a/daemon/suse_secrets.go b/daemon/suse_secrets.go +diff --git a/components/engine/daemon/suse_secrets.go b/components/engine/daemon/suse_secrets.go new file mode 100644 index 000000000000..9d0788f0410d --- /dev/null -+++ b/daemon/suse_secrets.go ++++ b/components/engine/daemon/suse_secrets.go @@ -0,0 +1,391 @@ +/* + * suse-secrets: patch for Docker to implement SUSE secrets @@ -432,5 +432,5 @@ + return nil +} -- -2.15.1 +2.16.1
