From c2ebf29a0636d85c33e232a592f40f8c7b02d2a3 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 12 Jul 2024 16:35:14 -0400 Subject: [PATCH 1/3] Upgrade to new RWD docker image The previous image was published using Docker Image Format 1, which is no longer supported by Docker v26 that comes with Ubuntu 22.04. We switched the RWD to publish to GitHub Container Registry, and updated the base TauDEM image to Ubuntu 16.04, the last version to support Python 2.7. --- .../ansible/roles/model-my-watershed.rwd/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml b/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml index de39381c9..c0a888116 100644 --- a/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml +++ b/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml @@ -2,7 +2,7 @@ rwd_data_path: "/opt/rwd-data" rwd_host: "localhost" rwd_port: 5000 -rwd_docker_image: "quay.io/wikiwatershed/rwd:2.0.0" +rwd_docker_image: "ghcr.io/wikiwatershed/rwd:3.0.0" app_config: RWD_HOST: "{{ rwd_host }}" From 9ff32a51317079c8074b128e93b317f9705bb533 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Sat, 13 Jul 2024 00:51:33 -0400 Subject: [PATCH 2/3] Revert "Upgrade to new RWD docker image" This reverts commit c2ebf29a0636d85c33e232a592f40f8c7b02d2a3. --- .../ansible/roles/model-my-watershed.rwd/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml b/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml index c0a888116..de39381c9 100644 --- a/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml +++ b/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml @@ -2,7 +2,7 @@ rwd_data_path: "/opt/rwd-data" rwd_host: "localhost" rwd_port: 5000 -rwd_docker_image: "ghcr.io/wikiwatershed/rwd:3.0.0" +rwd_docker_image: "quay.io/wikiwatershed/rwd:2.0.0" app_config: RWD_HOST: "{{ rwd_host }}" From e4f4224a95e3006f4d35d438cb13652eb0670d33 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Sat, 13 Jul 2024 00:51:43 -0400 Subject: [PATCH 3/3] Downgrade Docker to v25 to work with RWD --- deployment/ansible/group_vars/all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all index df0cc271e..c4de1785a 100644 --- a/deployment/ansible/group_vars/all +++ b/deployment/ansible/group_vars/all @@ -39,7 +39,7 @@ java_version: "8u*" java_major_version: "8" java_flavor: "openjdk" -docker_version: "5:26.*" +docker_version: "5:25.*" docker_containerd_version: "1.6.*" docker_python_version: "4.4.*" docker_compose_version: "1.29.*"