From 93f36830428a00682393d66feb60e30789554c28 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Tue, 7 Jul 2020 18:03:26 +0530 Subject: [PATCH] Use registry:2.7.0 instead of registry:2 htpasswd is removed in latest registry image[1] and it's breaking molecule job for tripleo_podman role, let's use working registry image. [1] https://github.com/docker/distribution-library-image/issues/106 Change-Id: I644210a2dcc4cb3810d0999e8c69f8d54f602793 (cherry picked from commit 439671e77011ef638a280041ad4469e4a764bf7c) Conflicts: tripleo_ansible/roles/tripleo-podman/molecule/login/prepare.yml --- .../roles/tripleo-podman/molecule/login/prepare.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tripleo_ansible/roles/tripleo-podman/molecule/login/prepare.yml b/tripleo_ansible/roles/tripleo-podman/molecule/login/prepare.yml index ab4661a4f..e2afb174d 100644 --- a/tripleo_ansible/roles/tripleo-podman/molecule/login/prepare.yml +++ b/tripleo_ansible/roles/tripleo-podman/molecule/login/prepare.yml @@ -43,7 +43,7 @@ docker pull ubuntu:16.04 docker tag ubuntu:16.04 localhost:5000/my-ubuntu mkdir auth - docker run --entrypoint htpasswd registry:2 -Bbn testuser testpassword > auth/htpasswd + docker run --entrypoint htpasswd registry:2.7.0 -Bbn testuser testpassword > auth/htpasswd docker container stop registry docker run -d -p 5000:5000 --restart=always \ --name registry \ @@ -51,7 +51,7 @@ -e "REGISTRY_AUTH=htpasswd" \ -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \ -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \ - registry:2 + registry:2.7.0 args: creates: /root/auth/htpasswd