Skip to content

Bug 2073113: do not report docker conf deprecation warning when the docker is not available #1106

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

Merged
openshift-merge-robot merged 2 commits into from
Apr 22, 2022
Merged

Bug 2073113: do not report docker conf deprecation warning when the docker is not available #1106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15eda52
Bug 2073113: do not report docker conf deprecation warning when the d…
atiratree Apr 8, 2022
a373e14
specify a subject of the docker conf deprecation message
atiratree Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
specify a subject of the docker conf deprecation message
  • Loading branch information
@atiratree
atiratree committed Apr 8, 2022
commit a373e148e42380f732ac7e77b3ff7a8e8b51ca8f
4 changes: 2 additions & 2 deletions pkg/cli/registry/login/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ func (o *LoginOptions) Run() error {

if o.ConfigFile == "-" {
// TODO: deprecated, remove in 4.12
fmt.Fprint(o.IOStreams.ErrOut, "Warning: support for stdout output is deprecated. The support will be removed in the future version.\n")
fmt.Fprint(o.IOStreams.ErrOut, "Warning: support for stdout output is deprecated. The support will be removed in the future version of oc.\n")
authFilePath, err = createTmpAuthFile()
if err != nil {
return err
Expand Down Expand Up @@ -344,7 +344,7 @@ func (o *LoginOptions) ensureEmptyAuthFileInitialized(configFile string) error {
}
if !os.IsNotExist(err) && fileInfo.Size() == 0 {
// TODO: deprecated, remove in 4.12
fmt.Fprint(o.IOStreams.ErrOut, "Warning: support for empty registry config files is deprecated. The support will be removed in the future version.\n")
fmt.Fprint(o.IOStreams.ErrOut, "Warning: support for empty registry config files is deprecated. The support will be removed in the future version of oc.\n")
file, err := os.OpenFile(configFile, os.O_APPEND|os.O_WRONLY, 0600)
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion pkg/helpers/image/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func GetRegistryAuthConfigPreference() (RegistryAuthConfigPreference, string) {
result = RegistryAuthConfigPreference(authPreference)
} else {
// TODO: remove once deprecated in 4.12
warning = "Warning: the default reading order of registry auth file will be changed from \"${HOME}/.docker/config.json\" to podman registry config locations in the future version. \"${HOME}/.docker/config.json\" is deprecated, but can still be used for storing credentials as a fallback. See https://github.com/containers/image/blob/main/docs/containers-auth.json.5.md for the order of podman registry config locations.\n"
warning = "Warning: the default reading order of registry auth file will be changed from \"${HOME}/.docker/config.json\" to podman registry config locations in the future version of oc. \"${HOME}/.docker/config.json\" is deprecated, but can still be used for storing credentials as a fallback. See https://github.com/containers/image/blob/main/docs/containers-auth.json.5.md for the order of podman registry config locations.\n"
}
return result, warning
}