From f93908213a44f46a748470f29b8a0ef142daa04d Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Mon, 8 Oct 2018 16:25:12 -0700 Subject: [PATCH] Update release note link to final location We'll be using a redirect from this URL to the back-end docs system for hosting release notes. Final location confirmed with Docs team and PM. Signed-off-by: Daniel Hiltgen --- cli/command/engine/check.go | 2 +- cli/command/engine/testdata/check-all.golden | 18 +++++++++--------- .../engine/testdata/check-no-downgrades.golden | 8 ++++---- .../engine/testdata/check-no-prerelease.golden | 12 ++++++------ .../engine/testdata/check-patches-only.golden | 4 ++-- internal/containerizedengine/update.go | 2 +- internal/containerizedengine/update_test.go | 6 +++--- types/types.go | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cli/command/engine/check.go b/cli/command/engine/check.go index 2a41392117..0a4d19ed8d 100644 --- a/cli/command/engine/check.go +++ b/cli/command/engine/check.go @@ -117,7 +117,7 @@ func processVersions(currentVersion, verType string, availUpdates = append(availUpdates, clitypes.Update{ Type: verType, Version: ver.Tag, - Notes: fmt.Sprintf("%s/%s", clitypes.ReleaseNotePrefix, ver.Tag), + Notes: fmt.Sprintf("%s?%s", clitypes.ReleaseNotePrefix, ver.Tag), }) } } diff --git a/cli/command/engine/testdata/check-all.golden b/cli/command/engine/testdata/check-all.golden index a6a5c70fe9..d084c785d4 100644 --- a/cli/command/engine/testdata/check-all.golden +++ b/cli/command/engine/testdata/check-all.golden @@ -1,11 +1,11 @@ TYPE VERSION NOTES current 1.1.0 -patch 1.1.1 https://docs.docker.com/releasenotes/1.1.1 -patch 1.1.2 https://docs.docker.com/releasenotes/1.1.2 -patch 1.1.3-beta1 https://docs.docker.com/releasenotes/1.1.3-beta1 -upgrade 1.2.0 https://docs.docker.com/releasenotes/1.2.0 -upgrade 2.0.0 https://docs.docker.com/releasenotes/2.0.0 -upgrade 2.1.0-beta1 https://docs.docker.com/releasenotes/2.1.0-beta1 -downgrade 1.0.1 https://docs.docker.com/releasenotes/1.0.1 -downgrade 1.0.2 https://docs.docker.com/releasenotes/1.0.2 -downgrade 1.0.3-beta1 https://docs.docker.com/releasenotes/1.0.3-beta1 +patch 1.1.1 https://docker.com/engine/releasenotes?1.1.1 +patch 1.1.2 https://docker.com/engine/releasenotes?1.1.2 +patch 1.1.3-beta1 https://docker.com/engine/releasenotes?1.1.3-beta1 +upgrade 1.2.0 https://docker.com/engine/releasenotes?1.2.0 +upgrade 2.0.0 https://docker.com/engine/releasenotes?2.0.0 +upgrade 2.1.0-beta1 https://docker.com/engine/releasenotes?2.1.0-beta1 +downgrade 1.0.1 https://docker.com/engine/releasenotes?1.0.1 +downgrade 1.0.2 https://docker.com/engine/releasenotes?1.0.2 +downgrade 1.0.3-beta1 https://docker.com/engine/releasenotes?1.0.3-beta1 diff --git a/cli/command/engine/testdata/check-no-downgrades.golden b/cli/command/engine/testdata/check-no-downgrades.golden index 790b7dd176..6d1a6f447a 100644 --- a/cli/command/engine/testdata/check-no-downgrades.golden +++ b/cli/command/engine/testdata/check-no-downgrades.golden @@ -1,6 +1,6 @@ TYPE VERSION NOTES current 1.1.0 -patch 1.1.1 https://docs.docker.com/releasenotes/1.1.1 -patch 1.1.2 https://docs.docker.com/releasenotes/1.1.2 -upgrade 1.2.0 https://docs.docker.com/releasenotes/1.2.0 -upgrade 2.0.0 https://docs.docker.com/releasenotes/2.0.0 +patch 1.1.1 https://docker.com/engine/releasenotes?1.1.1 +patch 1.1.2 https://docker.com/engine/releasenotes?1.1.2 +upgrade 1.2.0 https://docker.com/engine/releasenotes?1.2.0 +upgrade 2.0.0 https://docker.com/engine/releasenotes?2.0.0 diff --git a/cli/command/engine/testdata/check-no-prerelease.golden b/cli/command/engine/testdata/check-no-prerelease.golden index acb5053563..f08f1b1c9e 100644 --- a/cli/command/engine/testdata/check-no-prerelease.golden +++ b/cli/command/engine/testdata/check-no-prerelease.golden @@ -1,8 +1,8 @@ TYPE VERSION NOTES current 1.1.0 -patch 1.1.1 https://docs.docker.com/releasenotes/1.1.1 -patch 1.1.2 https://docs.docker.com/releasenotes/1.1.2 -upgrade 1.2.0 https://docs.docker.com/releasenotes/1.2.0 -upgrade 2.0.0 https://docs.docker.com/releasenotes/2.0.0 -downgrade 1.0.1 https://docs.docker.com/releasenotes/1.0.1 -downgrade 1.0.2 https://docs.docker.com/releasenotes/1.0.2 +patch 1.1.1 https://docker.com/engine/releasenotes?1.1.1 +patch 1.1.2 https://docker.com/engine/releasenotes?1.1.2 +upgrade 1.2.0 https://docker.com/engine/releasenotes?1.2.0 +upgrade 2.0.0 https://docker.com/engine/releasenotes?2.0.0 +downgrade 1.0.1 https://docker.com/engine/releasenotes?1.0.1 +downgrade 1.0.2 https://docker.com/engine/releasenotes?1.0.2 diff --git a/cli/command/engine/testdata/check-patches-only.golden b/cli/command/engine/testdata/check-patches-only.golden index d572970380..08b4ecb181 100644 --- a/cli/command/engine/testdata/check-patches-only.golden +++ b/cli/command/engine/testdata/check-patches-only.golden @@ -1,4 +1,4 @@ TYPE VERSION NOTES current 1.1.0 -patch 1.1.1 https://docs.docker.com/releasenotes/1.1.1 -patch 1.1.2 https://docs.docker.com/releasenotes/1.1.2 +patch 1.1.1 https://docker.com/engine/releasenotes?1.1.1 +patch 1.1.2 https://docker.com/engine/releasenotes?1.1.2 diff --git a/internal/containerizedengine/update.go b/internal/containerizedengine/update.go index 3cd7b31082..3199b13521 100644 --- a/internal/containerizedengine/update.go +++ b/internal/containerizedengine/update.go @@ -179,5 +179,5 @@ func getReleaseNotesURL(imageName string) string { versionTag = taggedRef.Tag() } } - return fmt.Sprintf("%s/%s", clitypes.ReleaseNotePrefix, versionTag) + return fmt.Sprintf("%s?%s", clitypes.ReleaseNotePrefix, versionTag) } diff --git a/internal/containerizedengine/update_test.go b/internal/containerizedengine/update_test.go index 25ad7ab5a9..3acdcc0ba1 100644 --- a/internal/containerizedengine/update_test.go +++ b/internal/containerizedengine/update_test.go @@ -290,11 +290,11 @@ func TestActivateDoUpdateVerifyImageName(t *testing.T) { func TestGetReleaseNotesURL(t *testing.T) { imageName := "bogus image name #$%&@!" url := getReleaseNotesURL(imageName) - assert.Equal(t, url, clitypes.ReleaseNotePrefix+"/") + assert.Equal(t, url, clitypes.ReleaseNotePrefix+"?") imageName = "foo.bar/valid/repowithouttag" url = getReleaseNotesURL(imageName) - assert.Equal(t, url, clitypes.ReleaseNotePrefix+"/") + assert.Equal(t, url, clitypes.ReleaseNotePrefix+"?") imageName = "foo.bar/valid/repowithouttag:tag123" url = getReleaseNotesURL(imageName) - assert.Equal(t, url, clitypes.ReleaseNotePrefix+"/tag123") + assert.Equal(t, url, clitypes.ReleaseNotePrefix+"?tag123") } diff --git a/types/types.go b/types/types.go index b411fa44fb..e983365394 100644 --- a/types/types.go +++ b/types/types.go @@ -19,7 +19,7 @@ const ( RegistryPrefix = "docker.io/store/docker" // ReleaseNotePrefix is where to point users to for release notes - ReleaseNotePrefix = "https://docs.docker.com/releasenotes" + ReleaseNotePrefix = "https://docker.com/engine/releasenotes" // RuntimeMetadataName is the name of the runtime metadata file // When stored as a label on the container it is prefixed by "com.docker."