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 439671e770
)
Conflicts:
tripleo_ansible/roles/tripleo-podman/molecule/login/prepare.yml
This commit is contained in:
parent
0e712d5c98
commit
93f3683042
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue