From 4c0f649efdbd02452c14310f51caebfcfa9df10c Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 20 Jul 2020 08:38:12 -0600 Subject: [PATCH] More htpasswd fallout: use httpd-tools Newer buildah tests now depend on encryption functionality only present in later (2.7? 2.8?) versions of docker.io/registry. So, undo our earlier change in which we forced registry:2.6 to use its htpasswd. Instead, tests now require httpd-tools package and we use native host htpasswd. We revert back to using registry:2 (no dot), which is a moving target, so be prepared for future breakage. Signed-off-by: Ed Santiago --- buildah.spec | 1 + tests/test_buildah.sh | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index f4766c9..9dac202 100644 --- a/buildah.spec +++ b/buildah.spec @@ -89,6 +89,7 @@ Requires: bzip2 Requires: podman Requires: golang Requires: jq +Requires: httpd-tools %description tests %{summary} diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh index 6a064be..860a4ba 100755 --- a/tests/test_buildah.sh +++ b/tests/test_buildah.sh @@ -19,7 +19,7 @@ export IMGTYPE_BINARY=/usr/bin/buildah-imgtype # Start a registry pre_bats_setup() { - REGISTRY_FQIN=docker.io/library/registry:2.6 + REGISTRY_FQIN=docker.io/library/registry:2 AUTHDIR=/tmp/buildah-tests-auth.$$ mkdir -p $AUTHDIR @@ -33,8 +33,7 @@ pre_bats_setup() { fi if [ ! -e $AUTHDIR/htpasswd ]; then - podman run --rm --entrypoint htpasswd $REGISTRY_FQIN \ - -Bbn testuser testpassword > $AUTHDIR/htpasswd + htpasswd -Bbn testuser testpassword > $AUTHDIR/htpasswd fi podman rm -f registry || true