docker: podman-friendly image locations

Adds fully qualified canonical locations of container images, making the container technology setup podman-friendly. Closes reanahub/reana#729.
reanahub · Aug 8, 2023 · 764d26a · 764d26a
1 parent 3c1d413
commit 764d26a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@
 # under the terms of the MIT License; see LICENSE file for more details.
 
 # Use Ubuntu LTS base image
-FROM ubuntu:20.04
+FROM docker.io/library/ubuntu:20.04
 
 # Use default answers in installation commands
 ENV DEBIAN_FRONTEND=noninteractive

diff --git a/reana_workflow_controller/config.py b/reana_workflow_controller/config.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of REANA.
-# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022 CERN.
+# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023 CERN.
 #
 # REANA is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -56,23 +56,26 @@
 permitted on a ``jobs-status`` consumer."""
 
 REANA_WORKFLOW_ENGINE_IMAGE_CWL = os.getenv(
-    "REANA_WORKFLOW_ENGINE_IMAGE_CWL", "reanahub/reana-workflow-engine-cwl:latest"
+    "REANA_WORKFLOW_ENGINE_IMAGE_CWL",
+    "docker.io/reanahub/reana-workflow-engine-cwl:latest",
 )
 """CWL workflow engine version."""
 
 REANA_WORKFLOW_ENGINE_IMAGE_YADAGE = os.getenv(
-    "REANA_WORKFLOW_ENGINE_IMAGE_YADAGE", "reanahub/reana-workflow-engine-yadage:latest"
+    "REANA_WORKFLOW_ENGINE_IMAGE_YADAGE",
+    "docker.io/reanahub/reana-workflow-engine-yadage:latest",
 )
 """Yadage workflow engine version."""
 
 REANA_WORKFLOW_ENGINE_IMAGE_SERIAL = os.getenv(
-    "REANA_WORKFLOW_ENGINE_IMAGE_SERIAL", "reanahub/reana-workflow-engine-serial:latest"
+    "REANA_WORKFLOW_ENGINE_IMAGE_SERIAL",
+    "docker.io/reanahub/reana-workflow-engine-serial:latest",
 )
 """Serial workflow engine version."""
 
 REANA_WORKFLOW_ENGINE_IMAGE_SNAKEMAKE = os.getenv(
     "REANA_WORKFLOW_ENGINE_IMAGE_SNAKEMAKE",
-    "reanahub/reana-workflow-engine-snakemake:latest",
+    "docker.io/reanahub/reana-workflow-engine-snakemake:latest",
 )
 """Snakemake workflow engine version."""
 
@@ -124,14 +127,16 @@
 )
 """Common to all workflow engines environment variables for debug mode."""
 
-JUPYTER_INTERACTIVE_SESSION_DEFAULT_IMAGE = "jupyter/scipy-notebook:notebook-6.4.5"
+JUPYTER_INTERACTIVE_SESSION_DEFAULT_IMAGE = (
+    "docker.io/jupyter/scipy-notebook:notebook-6.4.5"
+)
 """Default image for Jupyter based interactive session deployments."""
 
 JUPYTER_INTERACTIVE_SESSION_DEFAULT_PORT = 8888
 """Default port for Jupyter based interactive session deployments."""
 
 JOB_CONTROLLER_IMAGE = os.getenv(
-    "REANA_JOB_CONTROLLER_IMAGE", "reanahub/reana-job-controller:latest"
+    "REANA_JOB_CONTROLLER_IMAGE", "docker.io/reanahub/reana-job-controller:latest"
 )
 """Default image for REANA Job Controller sidecar."""
 

diff --git a/run-tests.sh b/run-tests.sh
@@ -43,7 +43,7 @@ clean_old_db_container () {
 
 start_db_container () {
     echo '==> [INFO] Starting DB container...'
-    docker run --rm --name postgres__reana-workflow-controller -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -d postgres:12.13
+    docker run --rm --name postgres__reana-workflow-controller -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -d docker.io/library/postgres:12.13
     _check_ready "Postgres" _db_check
 }
 
@@ -90,11 +90,11 @@ check_pytest () {
 }
 
 check_dockerfile () {
-    docker run -i --rm hadolint/hadolint:v1.18.2 < Dockerfile
+    docker run -i --rm docker.io/hadolint/hadolint:v1.18.2 < Dockerfile
 }
 
 check_docker_build () {
-    docker build -t reanahub/reana-workflow-controller .
+    docker build -t docker.io/reanahub/reana-workflow-controller .
 }
 
 check_all () {