[ARVADOS] updated: bafff6941293d4cc12cda4209f1d7a2b10274ea3
Git user
git at public.curoverse.com
Wed Apr 12 14:39:10 EDT 2017
Summary of changes:
docker/migrate-docker19/migrate.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
via bafff6941293d4cc12cda4209f1d7a2b10274ea3 (commit)
from 17f22a2b220c38ebae5247d09f8c96ceec151957 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit bafff6941293d4cc12cda4209f1d7a2b10274ea3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Apr 12 18:38:33 2017 +0000
8567: Migrate unnamed images
diff --git a/docker/migrate-docker19/migrate.sh b/docker/migrate-docker19/migrate.sh
index 5386980..857678b 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)"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list