From dee634b21e48e467b0d7b5ef1b2965c1df5e41d1 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 14 Mar 2017 12:39:24 -0400 Subject: [PATCH] 8567: Add docker19 migration instructions to install guide. --- doc/_config.yml | 2 ++ .../migrate-docker19.html.textile.liquid | 25 +++++++++++++++++++ docker/migrate-docker19/README | 25 ------------------- sdk/python/arvados/commands/keepdocker.py | 2 +- 4 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 doc/install/migrate-docker19.html.textile.liquid delete mode 100644 docker/migrate-docker19/README diff --git a/doc/_config.yml b/doc/_config.yml index 22ae21400d..cfb35dcd18 100644 --- a/doc/_config.yml +++ b/doc/_config.yml @@ -171,3 +171,5 @@ navbar: - Helpful hints: - install/copy_pipeline_from_curoverse.html.textile.liquid - install/cheat_sheet.html.textile.liquid + - Migrating from Docker 1.9: + - install/migrate-docker19.html.textile.liquid diff --git a/doc/install/migrate-docker19.html.textile.liquid b/doc/install/migrate-docker19.html.textile.liquid new file mode 100644 index 0000000000..656cd911cc --- /dev/null +++ b/doc/install/migrate-docker19.html.textile.liquid @@ -0,0 +1,25 @@ +--- +layout: default +navsection: installguide +title: Migrating Docker images +... + +If you have an existing Arvados installation using Docker 1.9 and wish to update to Docker 1.10+, you must migrate the Docker images stored in Keep. + +The @arv-migrate-docker19@ tool converts Docker images stored in Arvados from image format v1 (Docker <= 1.9) to image format v2 (Docker >= 1.10). + +Requires Docker running on the local host (can be either 1.9 or 1.10+). + +Usage: + +# Run @arvados/docker/migrate-docker19/build.sh@ to create @arvados/migrate-docker19@ Docker image. +# Set ARVADOS_API_HOST and ARVADOS_API_TOKEN to the cluster you want to migrate. +# Run @arv-migrate-docker19@ from the Arvados Python SDK on the host (not in a container). + +This will query Arvados for v1 format Docker images. For each image that does not already have a corresponding v2 format image (as indicated by a docker_image_migration tag) it will perform the following process: + +i) download the image from Arvados +ii) load it into Docker +iii) update the Docker version, which updates the image +iv) save the v2 format image and upload to Arvados +v) create a migration link diff --git a/docker/migrate-docker19/README b/docker/migrate-docker19/README deleted file mode 100644 index 3fcd07ae12..0000000000 --- a/docker/migrate-docker19/README +++ /dev/null @@ -1,25 +0,0 @@ -Docker image format migration tool for Arvados. - -This converts Docker images stored in Arvados from image format v1 -(Docker <= 1.9) to image format v2 (Docker >= 1.10). - -Requires Docker running on the local host. - -Usage: - -1) Run arvados/docker/migrate-docker19/build.sh to create -arvados/migrate-docker19 Docker image. - -2) Set ARVADOS_API_HOST and ARVADOS_API_TOKEN to the cluster you want to migrate. - -3) Run arv-migrate-docker19 - -This will query Arvados for v1 format Docker images. For each image that does -not already have a corresponding v2 format image (as indicated by a -docker_image_migration tag) it will perform the following process: - -i) download the image from Arvados -ii) load it into Docker -iii) update the Docker version, which updates the image -iv) save the v2 format image and upload to Arvados -v) create a migration link diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py index 5603ade492..135edd4810 100644 --- a/sdk/python/arvados/commands/keepdocker.py +++ b/sdk/python/arvados/commands/keepdocker.py @@ -356,7 +356,7 @@ def migrate19(): 2) Set ARVADOS_API_HOST and ARVADOS_API_TOKEN to the cluster you want to migrate. - 3) Run arv-migrate-docker19 + 3) Run arv-migrate-docker19 from the Arvados Python SDK on the host (not in a container). This will query Arvados for v1 format Docker images. For each image that does not already have a corresponding v2 format image (as indicated by a -- 2.30.2