Merge pull request #754 from mtrmac/podman-login-consistency

Revert "Temporarily work around auth.json location confusion"
This commit is contained in:
Daniel J Walsh 2019-10-31 14:40:10 -04:00 committed by GitHub
commit 10d0ebb9fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,15 +14,6 @@ function setup() {
mkdir -p $_cred_dir/containers
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
testuser=testuser
testpassword=$(random_string 15)