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.

Sign up for GitHub

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

Jump to bottom

Add --compat-auth-file to login/logout #1731

Merged
merged 5 commits into from
Nov 16, 2023
Merged

Add --compat-auth-file to login/logout #1731

merged 5 commits into from
Nov 16, 2023

Commits on Nov 13, 2023

  1. Update c/image after containers/image#2173 

    > go get github.com/containers/image/v5@main
> go mod tidy && go mod vendor

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
    @mtrmac
    mtrmac committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    11ed0d5 View commit details
    Browse the repository at this point in the history

  2. Generalize CheckAuthFile 

    ... so that it can be used with a future --compat-auth-file option.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
    @mtrmac
    mtrmac committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    2e16fde View commit details
    Browse the repository at this point in the history

  3. Document GetDefaultAuthFile, and don't call it in CLI defaults 

    We _need_ to know whether the user explicitly set an option
or not, because --authfile and --compat-auth-file conflict.

Also, --authfile= (unset) and --authfile=$the_default_auth_json
have different effects, so setting the default value of the option
is _not_ a practical way to show what the system would do if the
option were not specified.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
    @mtrmac
    mtrmac committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    de06ef8 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Add DockerCompatAuthFile options to ...Options, and --compat-auth-file 

    Signed-off-by: Miloslav Trmač <mitr@redhat.com>
    @mtrmac
    mtrmac committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    19b71a1 View commit details
    Browse the repository at this point in the history

  2. Add a warning if --authfile points to .docker/config.json 

    Note that the warning can't be disabled.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
    @mtrmac
    mtrmac committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    eb481dc View commit details
    Browse the repository at this point in the history