Hello community,
here is the log from the commit of package docker for openSUSE:Factory checked in at 2018-06-03 12:28:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker (Old)
and /work/SRC/openSUSE:Factory/.docker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker"
Sun Jun 3 12:28:41 2018 rev:75 rq:612961 version:17.09.1_ce
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker/docker.changes 2018-05-15 10:32:00.219269694 +0200
+++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2018-06-03 12:28:46.624506375 +0200
@@ -1,0 +2,8 @@
+Tue May 29 08:10:48 UTC 2018 - asarai@suse.com
+
+- Update secrets patch to not log incorrect warnings when attempting to inject
+ non-existent host files. bsc#1065609
+ * secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch
+ * secrets-0002-SUSE-implement-SUSE-container-secrets.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch ++++++
--- /var/tmp/diff_new_pack.Nq0DHG/_old 2018-06-03 12:28:48.676431255 +0200
+++ /var/tmp/diff_new_pack.Nq0DHG/_new 2018-06-03 12:28:48.676431255 +0200
@@ -10,7 +10,7 @@
Signed-off-by: Antonio Murdaca
Signed-off-by: Aleksa Sarai
---
- .../engine/daemon/container_operations_unix.go | 24 +++++++++++++++++++---
+ .../daemon/container_operations_unix.go | 24 ++++++++++++++++---
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
@@ -70,5 +70,5 @@
return errors.Wrap(err, "error setting ownership for secret")
}
--
-2.16.1
+2.17.0
++++++ secrets-0002-SUSE-implement-SUSE-container-secrets.patch ++++++
--- /var/tmp/diff_new_pack.Nq0DHG/_old 2018-06-03 12:28:48.688430816 +0200
+++ /var/tmp/diff_new_pack.Nq0DHG/_new 2018-06-03 12:28:48.692430669 +0200
@@ -1,4 +1,4 @@
-From 3a7cd305f75fabc49460066e5452458a524ead5c Mon Sep 17 00:00:00 2001
+From a7533a3084e925eb478148ef30bec0d1f1b81ae3 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai
Date: Wed, 8 Mar 2017 11:43:29 +1100
Subject: [PATCH 2/2] SUSE: implement SUSE container secrets
@@ -10,12 +10,12 @@
SUSE-SPECIFIC, AND UPSTREAM DOES NOT APPROVE OF THIS CONCEPT BECAUSE IT
MAKES BUILDS NOT ENTIRELY REPRODUCIBLE.
-SUSE-Bugs: bsc#1057743 bsc#1055676 bsc#1030702
+SUSE-Bugs: bsc#1065609 bsc#1057743 bsc#1055676 bsc#1030702
Signed-off-by: Aleksa Sarai
---
components/engine/daemon/start.go | 5 +
- components/engine/daemon/suse_secrets.go | 391 +++++++++++++++++++++++++++++++
- 2 files changed, 396 insertions(+)
+ components/engine/daemon/suse_secrets.go | 399 +++++++++++++++++++++++
+ 2 files changed, 404 insertions(+)
create mode 100644 components/engine/daemon/suse_secrets.go
diff --git a/components/engine/daemon/start.go b/components/engine/daemon/start.go
@@ -36,10 +36,10 @@
return systemError{err}
diff --git a/components/engine/daemon/suse_secrets.go b/components/engine/daemon/suse_secrets.go
new file mode 100644
-index 000000000000..9d0788f0410d
+index 000000000000..00e485368b47
--- /dev/null
+++ b/components/engine/daemon/suse_secrets.go
-@@ -0,0 +1,391 @@
+@@ -0,0 +1,399 @@
+/*
+ * suse-secrets: patch for Docker to implement SUSE secrets
+ * Copyright (C) 2017 SUSE LLC.
@@ -143,6 +143,10 @@
+ var suseFiles []*SuseFakeFile
+
+ path := filepath.Join(prefix, dir)
++ if _, err := os.Lstat(path); err != nil && os.IsNotExist(err) {
++ // If the path doesn't exist at all we don't inject anything.
++ return nil, nil
++ }
+ fi, err := os.Stat(path)
+ if err != nil {
+ // Ignore dangling symlinks.
@@ -259,6 +263,10 @@
+// readFile returns a secret given a file under a given prefix.
+func readFile(prefix, file string) ([]*SuseFakeFile, error) {
+ path := filepath.Join(prefix, file)
++ if _, err := os.Lstat(path); err != nil && os.IsNotExist(err) {
++ // If the path doesn't exist at all we don't inject anything.
++ return nil, nil
++ }
+ fi, err := os.Stat(path)
+ if err != nil {
+ // Ignore dangling symlinks.
@@ -432,5 +440,5 @@
+ return nil
+}
--
-2.16.1
+2.17.0