Skip to content
This repository was archived by the owner on May 27, 2026. It is now read-only.

Rename LICENSE.code → LICENSE#20

Merged
crosbymichael merged 1 commit into
docker:masterfrom
ijc:rename-license-code
Dec 18, 2018
Merged

Rename LICENSE.code → LICENSE#20
crosbymichael merged 1 commit into
docker:masterfrom
ijc:rename-license-code

Conversation

@ijc

@ijc ijc commented Dec 18, 2018

Copy link
Copy Markdown
Contributor

This allows automated tooling (such as license compatibilty checkers, such as
wwhrd or anything using go-license) to find it.

LICENSE.docs is left as it is. My argument for giving the code the "privileged"
position is that automated tooling is going to primarily be interested in code
(e.g. vendoring) while docs are not typically vendored or subject to automatic
inclusion in quite the same way.

Signed-off-by: Ian Campbell [email protected]

This is similar in spirit to opencontainers/go-digest#38. For completeness there isa PR ryanuber/go-license#16 but it's from 2015.

This allows automated tooling (such as license compatibilty checkers, such as
`wwhrd` or anything using `go-license`) to find it.

LICENSE.docs is left as it is. My argument for giving the code the "privileged"
position is that automated tooling is going to primarily be interested in code
(e.g. vendoring) while docs are not typically vendored or subject to automatic
inclusion in quite the same way.

Signed-off-by: Ian Campbell <[email protected]>
@crosbymichael

Copy link
Copy Markdown
Contributor

LGTM

@crosbymichael
crosbymichael merged commit b847168 into docker:master Dec 18, 2018
@ijc

ijc commented Dec 18, 2018

Copy link
Copy Markdown
Contributor Author

Wow, you beat me going away immediately to add an override to my .wwhrd.yml with a link here. Thanks!

@ijc
ijc deleted the rename-license-code branch December 18, 2018 15:35
thaJeztah added a commit to thaJeztah/containerd that referenced this pull request Jan 13, 2020
full diff: docker/go-metrics@4ea375f...v0.0.1

- docker/go-metrics#15 Add functions that instruments http handler using promhttp
- docker/go-metrics#20 Rename LICENSE.code → LICENSE
- docker/go-metrics#22 Support Go Modules

Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Jan 16, 2020
bump docker/go-metrics v0.0.1:

full diff: docker/go-metrics@d466d4f...v0.0.1

- docker/go-metrics#16 fix the compilation error against prometheus/client-golang master
- fixes docker/go-metrics#12 No longer builds against Prom master
- docker/go-metrics#18 metrics: address compile error correctly
- fixes docker/go-metrics#12 No longer builds against Prom master
- docker/go-metrics#15 Add functions that instruments http handler using promhttp
- docker/go-metrics#20 Rename LICENSE.code → LICENSE
- docker/go-metrics#22 Support Go Modules

bump prometheus/client_golang v0.9.4:

full diff: prometheus/client_golang@c5b7fcc...v0.9.4

version v0.9.0 is the minimum required version to work with go-metrics v0.0.1,
as it depends on `prometheus.Observer`:

    vendor/github.com/docker/go-metrics/timer.go:39:4: undefined: prometheus.Observer

Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Jan 17, 2020
bump docker/go-metrics v0.0.1:

full diff: docker/go-metrics@d466d4f...v0.0.1

- docker/go-metrics#16 fix the compilation error against prometheus/client-golang master
- fixes docker/go-metrics#12 No longer builds against Prom master
- docker/go-metrics#18 metrics: address compile error correctly
- fixes docker/go-metrics#12 No longer builds against Prom master
- docker/go-metrics#15 Add functions that instruments http handler using promhttp
- docker/go-metrics#20 Rename LICENSE.code → LICENSE
- docker/go-metrics#22 Support Go Modules

bump prometheus/client_golang v0.9.4:

full diff: prometheus/client_golang@c5b7fcc...v0.9.4

version v0.9.0 is the minimum required version to work with go-metrics v0.0.1,
as it depends on `prometheus.Observer`:

    vendor/github.com/docker/go-metrics/timer.go:39:4: undefined: prometheus.Observer

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: b2db7c8bc967b52609877f5d856c338ea51e4c46
Component: engine
tussennet pushed a commit to tussennet/containerd that referenced this pull request Sep 11, 2020
full diff: docker/go-metrics@4ea375f...v0.0.1

- docker/go-metrics#15 Add functions that instruments http handler using promhttp
- docker/go-metrics#20 Rename LICENSE.code → LICENSE
- docker/go-metrics#22 Support Go Modules

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants