opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

APIv2 tests: (try to) fix flaky registry panic

Browse Source 
APIv2 tests are flaky after this morning's merge of #14543.

Symptom:
   test-apiv2: Timed out (10s) waiting for service (/dev/tcp/localhost/5564)

journal shows:
   registry[7421]: panic: unable to configure authorization (htpasswd):
      no access controller registered with name: none

Possible cause:
   Mix of REGISTRY_AUTH=none with REGISTRY_AUTH_HTPASSWD_* vars.
      https://github.com/distribution/distribution/issues/1168

Solution:
   only set _HTPASSWD_* vars when AUTH=htpasswd

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2022-06-09 12:17:17 -06:00
parent 874ca426eb
commit 2b97795c19
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/apiv2/test-apiv2
View File

@ -443,12 +443,18 @@ function start_registry() {
# If invoked with auth=htpasswd, create credentials # If invoked with auth=htpasswd, create credentials
REGISTRY_USERNAME= REGISTRY_USERNAME=
REGISTRY_PASSWORD= REGISTRY_PASSWORD=
declare -a registry_auth_params=(-e "REGISTRY_AUTH=$auth")
if [[ "$auth" = "htpasswd" ]]; then if [[ "$auth" = "htpasswd" ]]; then
REGISTRY_USERNAME=u$(random_string 7) REGISTRY_USERNAME=u$(random_string 7)
REGISTRY_PASSWORD=p$(random_string 7) REGISTRY_PASSWORD=p$(random_string 7)
htpasswd -Bbn ${REGISTRY_USERNAME} ${REGISTRY_PASSWORD} \ htpasswd -Bbn ${REGISTRY_USERNAME} ${REGISTRY_PASSWORD} \
> $AUTHDIR/htpasswd > $AUTHDIR/htpasswd
registry_auth_params+=(
-e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm"
-e "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd"
)
fi fi
# Run the registry, and wait for it to come up # Run the registry, and wait for it to come up
@ -456,9 +462,7 @@ function start_registry() {
-p ${REGISTRY_PORT}:5000 \ -p ${REGISTRY_PORT}:5000 \
--name registry \ --name registry \
-v $AUTHDIR:/auth:Z \ -v $AUTHDIR:/auth:Z \
-e "REGISTRY_AUTH=$auth" \ "${registry_auth_params[@]}" \
-e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \
-e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \
-e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \ -e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \
-e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \ -e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \
${REGISTRY_IMAGE} ${REGISTRY_IMAGE}