From a61156fa80371853a50edd79627455c98a0a19b863861ccad99d0058f9d1e222 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Thu, 25 May 2017 08:24:46 +0000 Subject: [PATCH] Accepting request 496617 from home:scarabeus_iv:branches:Virtualization:containers - 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 OBS-URL: https://build.opensuse.org/request/show/496617 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=187 --- docker.changes | 8 ++++++++ docker.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docker.changes b/docker.changes index 35016e2..f733b67 100644 --- a/docker.changes +++ b/docker.changes @@ -5,6 +5,14 @@ Wed May 17 14:41:29 UTC 2017 - asarai@suse.com backport of https://github.com/moby/moby/pull/33250. + bsc1037607-0001-apparmor-make-pkg-aaparser-work-on-read-only-root.patch +------------------------------------------------------------------- +Thu May 11 07:36:32 UTC 2017 - tchvatal@suse.com + +- 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 + ------------------------------------------------------------------- Wed May 10 13:54:44 UTC 2017 - asarai@suse.com diff --git a/docker.spec b/docker.spec index ef39fc6..53410ae 100644 --- a/docker.spec +++ b/docker.spec @@ -335,7 +335,7 @@ install -D -m 0644 %{SOURCE9} %{buildroot}%{docker_migration_warnfile} # 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.