rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

Accepting request 423023 from home:jordimassaguerpla:branch:V:c:fix_migration_code_again

Browse Source 
- fix bsc#995102 - Docker "migrator" prevents installing "docker",
  if docker 1.9 was installed before but there were no images

OBS-URL: https://build.opensuse.org/request/show/423023
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=133
This commit is contained in:
Aleksa Sarai 2016-08-26 10:03:39 +00:00 committed by Git OBS Bridge
parent d3620f68cb
commit 423e97ff39
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 26 10:00:36 UTC 2016 - jmassaguerpla@suse.com
- fix bsc#995102 - Docker "migrator" prevents installing "docker",
if docker 1.9 was installed before but there were no images
-------------------------------------------------------------------
Fri Aug 26 08:49:15 UTC 2016 - asarai@suse.com

2
docker.spec
View File

@ -333,7 +333,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_store}" -maxdepth 1 -type d 2>/dev/null | grep -Ev '_tmp|^%{docker_store}$')" ]]; then
if [[ -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.