github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-04 12:39:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #984 from mtrmac/htpasswd-1.1

Browse Source 
Run htpasswd from our build-container instead of registry:2
This commit is contained in:
Miloslav Trmač 2020-07-16 20:20:36 +02:00 committed by GitHub
commit 747abd054f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -7,6 +7,8 @@ RUN dnf -y update && dnf install -y make git golang golang-github-cpuguy83-md2ma
# gpgme bindings deps # gpgme bindings deps
libassuan-devel gpgme-devel \ libassuan-devel gpgme-devel \
gnupg \ gnupg \
# htpasswd for system tests
httpd-tools \
# OpenShift deps # OpenShift deps
which tar wget hostname util-linux bsdtar socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs xfsprogs lsof docker iproute \ which tar wget hostname util-linux bsdtar socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs xfsprogs lsof docker iproute \
bats jq podman runc \ bats jq podman runc \

3
systemtest/helpers.bash
View File

@ -314,8 +314,7 @@ start_registry() {
fi fi
if ! egrep -q "^$testuser:" $AUTHDIR/htpasswd; then if ! egrep -q "^$testuser:" $AUTHDIR/htpasswd; then
log_and_run $PODMAN run --rm --entrypoint htpasswd $REGISTRY_FQIN \ htpasswd -Bbn $testuser $testpassword >> $AUTHDIR/htpasswd
-Bbn $testuser $testpassword >> $AUTHDIR/htpasswd
fi fi
reg_args+=( reg_args+=(