From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 12 Apr 2017 18:38:33 +0000 (+0000)
Subject: 8567: Migrate unnamed images
X-Git-Tag: 1.1.0~309^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/bafff6941293d4cc12cda4209f1d7a2b10274ea3

8567: Migrate unnamed images
---

diff --git a/docker/migrate-docker19/migrate.sh b/docker/migrate-docker19/migrate.sh
index 53869808fa..857678bde8 100755
--- a/docker/migrate-docker19/migrate.sh
+++ b/docker/migrate-docker19/migrate.sh
@@ -28,6 +28,11 @@ image_tag=$4
 project_uuid=$5
 graph_driver=$6
 
+if [[ "$image_repo" = "<none>" ]] ; then
+  image_repo=none
+  image_tag=latest
+fi
+
 # Print free space in /var/lib/docker
 function freespace() {
     df -B1 /var/lib/docker | tail -n1 | sed 's/  */ /g' | cut -d' ' -f4
@@ -75,6 +80,7 @@ echo "Initial available space is $(freespace)"
 
 arv-get $image_tar_keepref | docker load
 
+
 docker tag $image_id $image_repo:$image_tag
 
 docker images -a
@@ -92,6 +98,11 @@ start_docker
 
 docker images -a
 
+if [[ "$image_repo" = "none" ]] ; then
+  image_repo=$(docker images -a --no-trunc | sed 's/  */ /g' | grep ^none | cut -d' ' -f3)
+  image_tag=""
+fi
+
 UUID=$(arv-keepdocker --force-image-format --project-uuid=$project_uuid $image_repo $image_tag)
 
 echo "Available space after arv-keepdocker is $(freespace)"