From 607e26e80132470cf776e8e1603445d0465e1b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20=C5=A0imko?= Date: Tue, 11 Jul 2023 16:31:25 +0200 Subject: [PATCH] docker: podman-friendly image locations Adds fully qualified canonical locations of container images, making the container technology setup podman-friendly. Closes reanahub/reana#729. --- Dockerfile | 2 +- run-tests.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5d4fd883..c50e969b 100644 --- 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/run-tests.sh b/run-tests.sh index 30829c01..00d1a475 100755 --- 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-server -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -d postgres:12.13 + docker run --rm --name postgres__reana-server -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-server . + docker build -t docker.io/reanahub/reana-server . } check_all () {