mirror of
https://github.com/containers/skopeo.git
synced 2025-06-01 19:25:29 +00:00
Merge pull request #754 from mtrmac/podman-login-consistency
Revert "Temporarily work around auth.json location confusion"
This commit is contained in:
commit
10d0ebb9fe
@ -14,15 +14,6 @@ function setup() {
|
|||||||
mkdir -p $_cred_dir/containers
|
mkdir -p $_cred_dir/containers
|
||||||
rm -f $_cred_dir/containers/auth.json
|
rm -f $_cred_dir/containers/auth.json
|
||||||
|
|
||||||
# TODO: This is here to work around
|
|
||||||
# https://github.com/containers/libpod/issues/4227 in the
|
|
||||||
# "auth: credentials via podman login" test.
|
|
||||||
# It should be removed once a packaged version of podman which includes
|
|
||||||
# that fix is available in our CI environment, since we _want_ to be
|
|
||||||
# checking that podman and skopeo agree on the default for where registry
|
|
||||||
# credentials should be stored.
|
|
||||||
export REGISTRY_AUTH_FILE=$_cred_dir/containers/auth.json
|
|
||||||
|
|
||||||
# Start authenticated registry with random password
|
# Start authenticated registry with random password
|
||||||
testuser=testuser
|
testuser=testuser
|
||||||
testpassword=$(random_string 15)
|
testpassword=$(random_string 15)
|
||||||
|
Loading…
Reference in New Issue
Block a user