From 7e2e5a3e949e64e169449cae842def32caf32c6a Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Thu, 23 Feb 2023 12:35:18 +0100 Subject: [PATCH] Add full path to image to prevent podman asking which registry to use --- .github/workflows/ansible-test-plugins.yml | 6 +++--- Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml index 5617133..5aeee56 100644 --- a/.github/workflows/ansible-test-plugins.yml +++ b/.github/workflows/ansible-test-plugins.yml @@ -286,7 +286,7 @@ jobs: services: db_primary: - image: ${{ matrix.db_engine_version }} + image: docker.io/library/${{ matrix.db_engine_version }} env: MARIADB_ROOT_PASSWORD: msandbox MYSQL_ROOT_PASSWORD: msandbox @@ -302,7 +302,7 @@ jobs: --health-retries 6 db_replica1: - image: ${{ matrix.db_engine_version }} + image: docker.io/library/${{ matrix.db_engine_version }} env: MARIADB_ROOT_PASSWORD: msandbox MYSQL_ROOT_PASSWORD: msandbox @@ -316,7 +316,7 @@ jobs: --health-retries 6 db_replica2: - image: ${{ matrix.db_engine_version }} + image: docker.io/library/${{ matrix.db_engine_version }} env: MARIADB_ROOT_PASSWORD: msandbox MYSQL_ROOT_PASSWORD: msandbox diff --git a/Makefile b/Makefile index bc8b493..f26ebd8 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ test-integration: --network podman \ --publish 3307:3306 \ --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \ - $(db_engine_version) \ + docker.io/library/$(db_engine_version) \ mysqld podman run \ --detach \ @@ -37,7 +37,7 @@ test-integration: --network podman \ --publish 3308:3306 \ --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \ - $(db_engine_version) \ + docker.io/library/$(db_engine_version) \ mysqld podman run \ --detach \ @@ -47,7 +47,7 @@ test-integration: --network podman \ --publish 3309:3306 \ --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \ - $(db_engine_version) \ + docker.io/library/$(db_engine_version) \ mysqld # Setup replication and restart containers podman exec primary bash -c 'echo -e [mysqld]\\nserver-id=1\\nlog-bin=/var/lib/mysql/primary-bin > /etc/mysql/conf.d/replication.cnf'