Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix creds sync from yaml #1142

Merged
merged 1 commit into from
Dec 30, 2020
Merged

fix creds sync from yaml #1142

merged 1 commit into from
Dec 30, 2020

Conversation

QiWang19
Copy link
Contributor

@QiWang19 QiWang19 commented Dec 23, 2020

Pass down the creds from yaml file only if the values are not empty.
Enables to use credentials from other authfiles alternatively.
close: #1122
Signed-off-by: Qi Wang [email protected]

cmd/skopeo/sync.go Outdated Show resolved Hide resolved
    Pass down the creds from yaml file only if the values are not empty.
    Enables to use credentials from other authfiles alternatively.
Signed-off-by: Qi Wang <[email protected]>
Copy link
Contributor

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks!

@@ -280,8 +280,9 @@ func imagesToCopyFromRegistry(registryName string, cfg registrySyncConfig, sourc
serverCtx.DockerDaemonCertPath = cfg.CertDir
serverCtx.DockerDaemonInsecureSkipTLSVerify = (cfg.TLSVerify.skip == types.OptionalBoolTrue)
serverCtx.DockerInsecureSkipTLSVerify = cfg.TLSVerify.skip
serverCtx.DockerAuthConfig = &cfg.Credentials

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely on-blocking nit: Maybe keep the blank line, to visually separate the serverCtx setup from the actual processing?

@rhatdan
Copy link
Member

rhatdan commented Dec 30, 2020

LGTM

@rhatdan rhatdan merged commit 766927d into containers:master Dec 30, 2020
samdoran added a commit to ansible/bedrock that referenced this pull request Apr 22, 2021
This was fixed in containers/skopeo#1142. Credentials in auth.json are
now used.
mattclay pushed a commit to mattclay/bedrock that referenced this pull request May 5, 2022
This was fixed in containers/skopeo#1142. Credentials in auth.json are
now used.
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sync does not seem to make use of docker.io credentials
3 participants