8567: Make sure /root/.cache/arvados/docker is tempdir volume mount as well.

diff --git a/docker/migrate-docker19/migrate.sh b/docker/migrate-docker19/migrate.sh
index 58d6665f2233cd206e7401f01444d9b1bc5339af..bdc267a43cd57f966673847bf12d0c3b9dabcac7 100755 (executable)
--- a/docker/migrate-docker19/migrate.sh
+++ b/docker/migrate-docker19/migrate.sh
@@ -6,6 +6,7 @@ function cleanup {
     kill $(cat /var/run/docker.pid)
     sleep 1
     rm -rf /var/lib/docker/*
+    rm -rf /root/.cache/arvados/docker/*
 }
 
 trap cleanup EXIT

diff --git a/sdk/python/arvados/commands/migrate19.py b/sdk/python/arvados/commands/migrate19.py
index 3705a9538c73661ee4b5e4fc7119caee0bdc59b8..4be99961ba0febcfcf36b254f582945427b133e8 100644 (file)
--- a/sdk/python/arvados/commands/migrate19.py
+++ b/sdk/python/arvados/commands/migrate19.py
@@ -154,6 +154,7 @@ def main(arguments=None):
         start = time.time()
 
         varlibdocker = tempfile.mkdtemp()
+        dockercache = tempfile.mkdtemp()
         try:
             with tempfile.NamedTemporaryFile() as envfile:
                 envfile.write("ARVADOS_API_HOST=%s\n" % (os.environ["ARVADOS_API_HOST"]))
@@ -167,6 +168,7 @@ def main(arguments=None):
                              "--rm",
                              "--env-file", envfile.name,
                              "--volume", "%s:/var/lib/docker" % varlibdocker,
+                             "--volume", "%s:/root/.cache/arvados/docker" % dockercache,
                              "arvados/migrate-docker19",
                              "/root/migrate.sh",
                              "%s/%s" % (old_image["collection"], tarfile),
@@ -211,6 +213,7 @@ def main(arguments=None):
             failures.append(old_image["collection"])
         finally:
             shutil.rmtree(varlibdocker)
+            shutil.rmtree(dockercache)
 
     logger.info("Successfully migrated %i images", len(success))
     if failures: