Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1421 from dhiltgen/final_url 

[18.09] Update release note link to final location
This commit is contained in:
Sebastiaan van Stijn 2018-10-16 19:42:48 +02:00 committed by GitHub
parent 39f1110308 f93908213a
commit 17adf05188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/engine/check.go
View File

@ -117,7 +117,7 @@ func processVersions(currentVersion, verType string,
availUpdates = append(availUpdates, clitypes.Update{ availUpdates = append(availUpdates, clitypes.Update{
Type: verType, Type: verType,
Version: ver.Tag, Version: ver.Tag,
Notes: fmt.Sprintf("%s/%s", clitypes.ReleaseNotePrefix, ver.Tag), Notes: fmt.Sprintf("%s?%s", clitypes.ReleaseNotePrefix, ver.Tag),
}) })
} }
} }

18
cli/command/engine/testdata/check-all.golden vendored
View File

@ -1,11 +1,11 @@
TYPE VERSION NOTES TYPE VERSION NOTES
current 1.1.0 current 1.1.0
patch 1.1.1 https://docs.docker.com/releasenotes/1.1.1 patch 1.1.1 https://docker.com/engine/releasenotes?1.1.1
patch 1.1.2 https://docs.docker.com/releasenotes/1.1.2 patch 1.1.2 https://docker.com/engine/releasenotes?1.1.2
patch 1.1.3-beta1 https://docs.docker.com/releasenotes/1.1.3-beta1 patch 1.1.3-beta1 https://docker.com/engine/releasenotes?1.1.3-beta1
upgrade 1.2.0 https://docs.docker.com/releasenotes/1.2.0 upgrade 1.2.0 https://docker.com/engine/releasenotes?1.2.0
upgrade 2.0.0 https://docs.docker.com/releasenotes/2.0.0 upgrade 2.0.0 https://docker.com/engine/releasenotes?2.0.0
upgrade 2.1.0-beta1 https://docs.docker.com/releasenotes/2.1.0-beta1 upgrade 2.1.0-beta1 https://docker.com/engine/releasenotes?2.1.0-beta1
downgrade 1.0.1 https://docs.docker.com/releasenotes/1.0.1 downgrade 1.0.1 https://docker.com/engine/releasenotes?1.0.1
downgrade 1.0.2 https://docs.docker.com/releasenotes/1.0.2 downgrade 1.0.2 https://docker.com/engine/releasenotes?1.0.2
downgrade 1.0.3-beta1 https://docs.docker.com/releasenotes/1.0.3-beta1 downgrade 1.0.3-beta1 https://docker.com/engine/releasenotes?1.0.3-beta1

8
cli/command/engine/testdata/check-no-downgrades.golden vendored
View File

@ -1,6 +1,6 @@
TYPE VERSION NOTES TYPE VERSION NOTES
current 1.1.0 current 1.1.0
patch 1.1.1 https://docs.docker.com/releasenotes/1.1.1 patch 1.1.1 https://docker.com/engine/releasenotes?1.1.1
patch 1.1.2 https://docs.docker.com/releasenotes/1.1.2 patch 1.1.2 https://docker.com/engine/releasenotes?1.1.2
upgrade 1.2.0 https://docs.docker.com/releasenotes/1.2.0 upgrade 1.2.0 https://docker.com/engine/releasenotes?1.2.0
upgrade 2.0.0 https://docs.docker.com/releasenotes/2.0.0 upgrade 2.0.0 https://docker.com/engine/releasenotes?2.0.0

12
cli/command/engine/testdata/check-no-prerelease.golden vendored
View File

@ -1,8 +1,8 @@
TYPE VERSION NOTES TYPE VERSION NOTES
current 1.1.0 current 1.1.0
patch 1.1.1 https://docs.docker.com/releasenotes/1.1.1 patch 1.1.1 https://docker.com/engine/releasenotes?1.1.1
patch 1.1.2 https://docs.docker.com/releasenotes/1.1.2 patch 1.1.2 https://docker.com/engine/releasenotes?1.1.2
upgrade 1.2.0 https://docs.docker.com/releasenotes/1.2.0 upgrade 1.2.0 https://docker.com/engine/releasenotes?1.2.0
upgrade 2.0.0 https://docs.docker.com/releasenotes/2.0.0 upgrade 2.0.0 https://docker.com/engine/releasenotes?2.0.0
downgrade 1.0.1 https://docs.docker.com/releasenotes/1.0.1 downgrade 1.0.1 https://docker.com/engine/releasenotes?1.0.1
downgrade 1.0.2 https://docs.docker.com/releasenotes/1.0.2 downgrade 1.0.2 https://docker.com/engine/releasenotes?1.0.2

4
cli/command/engine/testdata/check-patches-only.golden vendored
View File

@ -1,4 +1,4 @@
TYPE VERSION NOTES TYPE VERSION NOTES
current 1.1.0 current 1.1.0
patch 1.1.1 https://docs.docker.com/releasenotes/1.1.1 patch 1.1.1 https://docker.com/engine/releasenotes?1.1.1
patch 1.1.2 https://docs.docker.com/releasenotes/1.1.2 patch 1.1.2 https://docker.com/engine/releasenotes?1.1.2

2
internal/containerizedengine/update.go
View File

@ -179,5 +179,5 @@ func getReleaseNotesURL(imageName string) string {
versionTag = taggedRef.Tag() versionTag = taggedRef.Tag()
} }
} }
return fmt.Sprintf("%s/%s", clitypes.ReleaseNotePrefix, versionTag) return fmt.Sprintf("%s?%s", clitypes.ReleaseNotePrefix, versionTag)
} }

6
internal/containerizedengine/update_test.go
View File

@ -290,11 +290,11 @@ func TestActivateDoUpdateVerifyImageName(t *testing.T) {
func TestGetReleaseNotesURL(t *testing.T) { func TestGetReleaseNotesURL(t *testing.T) {
imageName := "bogus image name #$%&@!" imageName := "bogus image name #$%&@!"
url := getReleaseNotesURL(imageName) url := getReleaseNotesURL(imageName)
assert.Equal(t, url, clitypes.ReleaseNotePrefix+"/") assert.Equal(t, url, clitypes.ReleaseNotePrefix+"?")
imageName = "foo.bar/valid/repowithouttag" imageName = "foo.bar/valid/repowithouttag"
url = getReleaseNotesURL(imageName) url = getReleaseNotesURL(imageName)
assert.Equal(t, url, clitypes.ReleaseNotePrefix+"/") assert.Equal(t, url, clitypes.ReleaseNotePrefix+"?")
imageName = "foo.bar/valid/repowithouttag:tag123" imageName = "foo.bar/valid/repowithouttag:tag123"
url = getReleaseNotesURL(imageName) url = getReleaseNotesURL(imageName)
assert.Equal(t, url, clitypes.ReleaseNotePrefix+"/tag123") assert.Equal(t, url, clitypes.ReleaseNotePrefix+"?tag123")
} }

2
types/types.go
View File

@ -19,7 +19,7 @@ const (
RegistryPrefix = "docker.io/store/docker" RegistryPrefix = "docker.io/store/docker"
// ReleaseNotePrefix is where to point users to for release notes // 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 // RuntimeMetadataName is the name of the runtime metadata file
// When stored as a label on the container it is prefixed by "com.docker." // When stored as a label on the container it is prefixed by "com.docker."