Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2017-06-02 10:32:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Fri Jun 2 10:32:08 2017 rev:55 rq:499667 version:17.04.0_ce Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2017-05-23 10:18:59.332239279 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2017-06-02 10:33:09.737346585 +0200 @@ -1,0 +2,12 @@ +Tue May 30 11:29:45 UTC 2017 - [email protected] + +- Fix bsc#1032287: missing docker systemd configuration + +------------------------------------------------------------------- +Mon May 29 11:08:44 UTC 2017 - [email protected] + +- Update SUSE secrets patch to correctly handle restarting of containers. + + secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch + + secrets-0002-SUSE-implement-SUSE-container-secrets.patch + +------------------------------------------------------------------- @@ -6,0 +19,8 @@ + +------------------------------------------------------------------- +Thu May 11 07:36:32 UTC 2017 - [email protected] + +- Fix bsc#1038476 warning about non-executable docker + * Simply verify we have binary prior using it, might happen if + someone had docker installed and then did remove it and install + from scratch again ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.SBHAni/_old 2017-06-02 10:33:10.533234129 +0200 +++ /var/tmp/diff_new_pack.SBHAni/_new 2017-06-02 10:33:10.537233564 +0200 @@ -335,7 +335,7 @@ # will stick around if it has been migrated -- which is why we need the # MIGRATION_TESTFILE check). # 4. Check that there are images in the graph/ directory. -if [[ -d "%{docker_store}" && -n "$(find "%{docker_graph}" -maxdepth 1 -type d 2>/dev/null | grep -Ev '_tmp|^%{docker_graph}$')" ]]; then +if [[ -x %{_bindir}/docker && -d "%{docker_store}" && -n "$(find "%{docker_graph}" -maxdepth 1 -type d 2>/dev/null | grep -Ev '_tmp|^%{docker_graph}$')" ]]; then # Check if currently installed version of docker is old enough to need migration. CURRENT_DOCKER_VERSION=$(docker -v | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/') # This variable will contain the current docker version if migration is needed otherwise it will contain the upgrade point. ++++++ docker.service ++++++ --- /var/tmp/diff_new_pack.SBHAni/_old 2017-06-02 10:33:10.669214916 +0200 +++ /var/tmp/diff_new_pack.SBHAni/_new 2017-06-02 10:33:10.669214916 +0200 @@ -1,8 +1,8 @@ [Unit] Description=Docker Application Container Engine Documentation=http://docs.docker.com -After=network.target containerd.socket -Requires=containerd.socket +After=network.target containerd.socket containerd.service +Requires=containerd.socket containerd.service [Service] EnvironmentFile=/etc/sysconfig/docker ++++++ secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch ++++++ --- /var/tmp/diff_new_pack.SBHAni/_old 2017-06-02 10:33:10.701210395 +0200 +++ /var/tmp/diff_new_pack.SBHAni/_new 2017-06-02 10:33:10.701210395 +0200 @@ -1,4 +1,4 @@ -From 36b539ca64d8c47681d5f15689db03751962d496 Mon Sep 17 00:00:00 2001 +From 4de0a0a9689c4063d369d54ecc16952241c7f241 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 8 Mar 2017 12:41:54 +1100 Subject: [PATCH 1/2] daemon: allow directory creation in /run/secrets @@ -8,16 +8,17 @@ useful for creating directories and subdirectories of secrets. Backport: https://github.com/docker/docker/pull/31632 +Signed-off-by: Antonio Murdaca <[email protected]> Signed-off-by: Aleksa Sarai <[email protected]> --- - daemon/container_operations_unix.go | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) + daemon/container_operations_unix.go | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go -index 2296045765d4..bb08d3c4a207 100644 +index 67b3ee38c0ab..a538ba4e73e8 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go -@@ -177,11 +177,6 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) { +@@ -178,11 +178,6 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) { } targetPath := filepath.Clean(s.File.Name) @@ -29,23 +30,33 @@ fPath := filepath.Join(localMountPath, targetPath) if err := idtools.MkdirAllAs(filepath.Dir(fPath), 0700, rootUID, rootGID); err != nil { return errors.Wrap(err, "error creating secret mount path") -@@ -195,8 +190,14 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) { +@@ -196,9 +191,6 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) { if secret == nil { return fmt.Errorf("unable to get secret from secret store") } - if err := ioutil.WriteFile(fPath, secret.Spec.Data, s.File.Mode); err != nil { - return errors.Wrap(err, "error injecting secret") +- } + + uid, err := strconv.Atoi(s.File.UID) + if err != nil { +@@ -208,7 +200,15 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) { + if err != nil { + return err + } +- + if s.File.Mode.IsDir() { -+ if err := os.Mkdir(fPath, s.File.Mode); err != nil { ++ if err := idtools.MkdirAllAs(fPath, s.File.Mode, rootUID+uid, rootGID+gid); err != nil { + return errors.Wrap(err, "error injecting secret dir") + } + } else { + if err := ioutil.WriteFile(fPath, secret.Spec.Data, s.File.Mode); err != nil { + return errors.Wrap(err, "error injecting secret") + } ++ } + if err := os.Chown(fPath, rootUID+uid, rootGID+gid); err != nil { + return errors.Wrap(err, "error setting ownership for secret") } - - uid, err := strconv.Atoi(s.File.UID) -- -2.12.2 +2.13.0 ++++++ secrets-0002-SUSE-implement-SUSE-container-secrets.patch ++++++ --- /var/tmp/diff_new_pack.SBHAni/_old 2017-06-02 10:33:10.713208700 +0200 +++ /var/tmp/diff_new_pack.SBHAni/_new 2017-06-02 10:33:10.713208700 +0200 @@ -1,4 +1,4 @@ -From a7fbdb729255da73e47e77ca37eec0da325356c4 Mon Sep 17 00:00:00 2001 +From a6d2f9f43ea02d93534867271f7fa7cf0f77e70c Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Wed, 8 Mar 2017 11:43:29 +1100 Subject: [PATCH 2/2] SUSE: implement SUSE container secrets @@ -18,10 +18,10 @@ create mode 100644 daemon/suse_secrets.go diff --git a/daemon/start.go b/daemon/start.go -index 6c94fd5482d0..3c06eed778d7 100644 +index eddb5d3d5060..eb74e2ab1096 100644 --- a/daemon/start.go +++ b/daemon/start.go -@@ -146,6 +146,11 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint +@@ -141,6 +141,11 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint return err } @@ -35,7 +35,7 @@ return err diff --git a/daemon/suse_secrets.go b/daemon/suse_secrets.go new file mode 100644 -index 000000000000..591abc998e67 +index 000000000000..99bdbefdebcc --- /dev/null +++ b/daemon/suse_secrets.go @@ -0,0 +1,246 @@ @@ -66,8 +66,8 @@ + "syscall" + + "github.com/Sirupsen/logrus" -+ "github.com/opencontainers/go-digest" + "github.com/docker/docker/container" ++ "github.com/opencontainers/go-digest" + + swarmtypes "github.com/docker/docker/api/types/swarm" + swarmexec "github.com/docker/swarmkit/agent/exec" @@ -286,5 +286,5 @@ + return nil +} -- -2.12.2 +2.13.0
