Skip to content

Move schema1 deprecation notice#40671

Merged
thaJeztah merged 1 commit into
moby:masterfrom
cpuguy83:schema2v1_dep_notice_on_error_only
Mar 12, 2020
Merged

Move schema1 deprecation notice#40671
thaJeztah merged 1 commit into
moby:masterfrom
cpuguy83:schema2v1_dep_notice_on_error_only

Conversation

@cpuguy83

@cpuguy83 cpuguy83 commented Mar 11, 2020

Copy link
Copy Markdown
Member

Currently we show this deprecation notice for any error returned by a
registry.
Registries can return an error for any number of reasons.
Instead let's show the deprecation notice only if the fallback was
successful.

Closes docker/for-linux#942

@cpuguy83 cpuguy83 mentioned this pull request Mar 11, 2020
Closed
3 tasks
thaJeztah
thaJeztah approved these changes Mar 11, 2020
View reviewed changes

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

tao12345666333
tao12345666333 approved these changes Mar 12, 2020
View reviewed changes

@tao12345666333 tao12345666333 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@tao12345666333

tao12345666333 commented Mar 12, 2020

Copy link
Copy Markdown
Contributor

CI failure is on cleanup (unrelated)

[2020-03-11T19:49:44.455Z] DONE 273 tests, 5 skipped in 2614.944s
[2020-03-11T19:49:44.455Z] ---> Making bundle: .integration-daemon-stop (in bundles/test-integration)
[2020-03-11T19:49:45.012Z] ++++ cat bundles/test-integration/docker.pid
[2020-03-11T19:49:45.012Z] +++ kill 7459
[2020-03-11T19:49:45.934Z] ++++ cat bundles/test-integration/TestDockerDaemonSuite/TestFailedPluginRemove/d764cb1d3de31/docker.pid
[2020-03-11T19:49:45.934Z] +++ kill 4486
[2020-03-11T19:49:46.188Z] /go/src/github.com/docker/docker/hack/make/.integration-daemon-stop: line 13: wait: pid 4486 is not a child of this shell
[2020-03-11T19:49:46.188Z] warning: PID 4486 from bundles/test-integration/TestDockerDaemonSuite/TestFailedPluginRemove/d764cb1d3de31/docker.pid had a nonzero exit code
[2020-03-11T19:49:46.188Z] umount: /go/src/github.com/docker/docker/bundles/test-integration/TestDockerDaemonSuite/TestFailedPluginRemove/d764cb1d3de31/root: target is busy.
[2020-03-11T19:49:46.188Z] +++ /etc/init.d/apparmor stop
[2020-03-11T19:49:46.188Z] Leaving: AppArmorNo profiles have been unloaded.
[2020-03-11T19:49:46.188Z] 
[2020-03-11T19:49:46.188Z] Unloading profiles will leave already running processes permanently
[2020-03-11T19:49:46.188Z] unconfined, which can lead to unexpected situations.
[2020-03-11T19:49:46.188Z] 
[2020-03-11T19:49:46.188Z] To set a process to complain mode, use the command line tool
[2020-03-11T19:49:46.188Z] 'aa-complain'. To really tear down all profiles, run 'aa-teardown'."
[2020-03-11T19:49:46.188Z] +++ true
[2020-03-11T19:49:46.188Z] 
[2020-03-11T19:49:46.442Z] Remaining pids to kill: []
script returned exit code 1

@cpuguy83
Move schema1 deprecation notice
6859bc7 
Currently we show this deprecation notice for any error returned by a
registry.
Registries can return an error for any number of reasons.
Instead let's show the deprecation notice only if the fallback was
successful.

Signed-off-by: Brian Goff <[email protected]>
@cpuguy83
cpuguy83 force-pushed the schema2v1_dep_notice_on_error_only branch from 4ab98f2 to 6859bc7 Compare March 12, 2020 18:17
@cpuguy83

cpuguy83 commented Mar 12, 2020

Copy link
Copy Markdown
Member Author

Rebased to get lint fixes.

@thaJeztah
thaJeztah merged commit d959c20 into moby:master Mar 12, 2020
@cpuguy83
cpuguy83 deleted the schema2v1_dep_notice_on_error_only branch March 12, 2020 19:30
@thaJeztah thaJeztah mentioned this pull request Mar 12, 2020
Merged
@cpuguy83 cpuguy83 mentioned this pull request Mar 12, 2020
Closed
@thaJeztah thaJeztah added this to the 20.03.0 milestone Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes
@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes
@tonistiigi tonistiigi Awaiting requested review from tonistiigi
@tiborvass tiborvass Awaiting requested review from tiborvass
+1 more reviewer
@tao12345666333 tao12345666333 tao12345666333 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/distribution Image Distribution impact/deprecation kind/bugfix PR's that fix bugs process/cherry-picked status/4-merge

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

[DEPRECATION NOTICE] registry v2 schema1 support will be removed in an upcoming release.

4 participants

@cpuguy83 @tao12345666333 @thaJeztah @AkihiroSuda