From 05c97120decfeeb9ba2faa20561ee1f37c8293ba Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 21 Mar 2017 17:37:30 -0400 Subject: [PATCH] 8567: Make sure /root/.cache/arvados/docker is tempdir volume mount as well. --- docker/migrate-docker19/migrate.sh | 1 + sdk/python/arvados/commands/migrate19.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docker/migrate-docker19/migrate.sh b/docker/migrate-docker19/migrate.sh index 58d6665f22..bdc267a43c 100755 --- 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 3705a9538c..4be99961ba 100644 --- 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: -- 2.30.2