Determine Upsteam Commits to Incorporate into this Fork
Context
This issue serves as a jumping off point for determining which commits to include from upstream master. None of these commits cherry-pick cleanly (see #54 for those that do), so the difficultly/usefulness of these commits needs to be evaluated.
upstream/master
not present in release/2.8-gitlab
Commits in Please link the related MR when you start working in porting one of these changes.
Upstream Commit | Subject | Effort to Merge | Merge Request | Cherry-Picks Cleanly | Files Changed | Insertions | Deletions |
---|---|---|---|---|---|---|---|
be29c05a Upstream | Remove deprecated cache metrics code | Undetermined | !288 (merged) | N | 2 files changed | 4 insertions(+) | 125 deletions(-) |
495a4af7 Upstream | Fix goimports | Undetermined | N | 2 files changed | 5 insertions(+) | 4 deletions(-) | |
ce101280 Upstream | fix redis caching issue | Undetermined | !288 (merged) | N | 1 file changed | 28 insertions(+) | 21 deletions(-) |
800cb958 Upstream | Use go-events package | Seems to move code into https://github.com/docker/go-events without significant changes in function. Not sure we want to depend on this lib as the last commit was over a year ago. | N | 25 files changed | 1346 insertions(+) | 522 deletions(-) | |
1e25ecef Upstream | Update governance and maintainers | Undetermined | N | 4 files changed | 211 insertions(+) | 240 deletions(-) | |
98dcc519 Upstream | vendor: update docker/go-metrics v0.0.1 | Undetermined | N | 216 files changed | 25440 insertions(+) | 3593 deletions(-) | |
e65b3f13 Upstream | Fix CI for test updates | Undetermined | N | 3 files changed | 10 insertions(+) | 6 deletions(-) | |
efdba4f2 Upstream | Increase Unit Test Code Coverage | Undetermined | !371 (merged) | N | 4 files changed | 141 insertions(+) | 5 deletions(-) |
1f77c9a5 Upstream | Update Golang 1.13.8 | Undetermined | N | 1 file changed | 1 insertion(+) | 1 deletion(-) | |
9b6a0190 Upstream | prevent dev-tools from updating go.mod | Undetermined | N | 2 files changed | 3 insertions(+) | 1 deletion(-) | |
7e290869 Upstream | vendor: update golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d (CVE-2020-7919) | Trivial | !370 (merged) | N28 | 11 files changed | 1248 insertions(+) | 271 deletions(-) |
01654953 Upstream | Dockerfile: use alpine 3.11 | Undetermined | N | 1 file changed | 2 insertions(+) | 2 deletions(-) | |
974375f6 Upstream | re-vendor with go 1.13 | Undetermined | N | 21 files changed | 31 insertions(+) | 5853 deletions(-) | |
4ae059c7 Upstream | Update Golang 1.13.7 (CVE-2020-0601, CVE-2020-7919) | Undetermined | N | 2 files changed | 4 insertions(+) | 2 deletions(-) | |
66809646 Upstream | Migrate to golangci-lint | Not Need (we're already on golangci-lint) | N | 34 files changed | 58 insertions(+) | 55 deletions(-) | |
23f6bdd7 Upstream | Use same env var in Dockerfile and Makefile | Undetermined | N | 1 file changed | 1 insertion(+) | 1 deletion(-) | |
6ca7b9e9 Upstream | Fix TestRegistryAsCacheMutationAPIs | Undetermined | N | 1 file changed | 2 insertions(+) | 1 deletion(-) | |
0f5e2753 Upstream | Fix typo cloudfront updatefrenquency | Undetermined | N | 2 files changed | 11 insertions(+) | 6 deletions(-) | |
5538da49 Upstream | fixes to make layersPathSpec work | Undetermined | N | 2 files changed | 3 insertions(+) | 3 deletions(-) | |
b4694b0d Upstream | Fixing broken table | Undetermined | N | 1 file changed | 5 insertions(+) | 5 deletions(-) | |
070cc010 Upstream | bump golang to 1.13.4 | Not Needed: We need to keep sync with GitLab | N | 1 file changed | 1 insertion(+) | 1 deletion(-) | |
07a50201 Upstream | Adding deprecated schema instructions | Trivial | N | 1 file changed | 41 insertions(+) | ||
a994bb83 Upstream | use latest version of alpine when building the Docker container | Not Needed: We use a pinned version | N | 1 file changed | 1 insertion(+) | 1 deletion(-) | |
dd3bdee2 Upstream | implement Repository Blobs upload resuming | Not Sure: Client may only be for deprecated proxy | N | 2 files changed | 102 insertions(+) | 2 deletions(-) | |
898b1f2a Upstream | test httpBlobUpload.Write method | Not Sure: Client may only be for deprecated proxy | N | 1 file changed | 196 insertions(+) | 1 deletion(-) | |
c5d5f938 Upstream | fast-stop ServeBlob if we're doing a HEAD request | Not Sure: Client may only be for deprecated proxy | N | 2 files changed | 57 insertions(+) | 5 deletions(-) | |
a45e5cb1 Upstream | handle create blob if the uuid couldn't be retrieved from headers or URL | Undetermined | N | 2 files changed | 90 insertions(+) | 1 deletion(-) | |
94097512 Upstream | extract blob upload resume into its own method | Easy | !365 (merged) | N | 1 file changed | 54 insertions(+) | 47 deletions(-) |
afe29bb6 Upstream | update the golang compiler version and the versions of several dependencies | Easy | N28 | 209 files changed | 31615 insertions(+) | 7696 deletions(-) | |
45b2d049 Upstream | use latest version of alpine when building the Docker container | Not Needed: We use a pinned verion. | N | 1 file changed | 1 insertion(+) | 1 deletion(-) | |
5223c274 Upstream | migrate to go modules from vndr | Not Needed: Already done | !117 (merged) | N | 503 files changed | 273717 insertions(+) | 9478 deletions(-) |
8f9c8094 Upstream | replace rsc.io/letsencrypt in favour of golang.org/x/crypto | Not Needed: Already done | !117 (merged) | N | 129 files changed | 6549 insertions(+) | 37722 deletions(-) |
fd77cf43 Upstream | change package name & format document | Unknown: Support for AliCDN | N | 2 files changed | 8 insertions(+) | 8 deletions(-) | |
c18c6c33 Upstream | S3 Driver: added comment for missing KeyCount workaround | Not Needed (already in release branch with 1e188573) | N | 1 file changed | 3 insertions(+) | ||
f8777265 Upstream | Fix s3 driver for supporting ceph radosgw | Not Needed (already in release branch with ea491f8c) | N | 1 file changed | 10 insertions(+) | 2 deletions(-) | |
3390f32a Upstream | fix Context issue | Trivial | N | 6 files changed | 259 insertions(+) | 24 deletions(-) | |
ae91d1f4 Upstream | fix ci issue | Unknown: Support for AliCDN | N | 1 file changed | 1 insertion(+) | 1 deletion(-) | |
6e10631d Upstream | fix default cdn auth duration | Unknown: Support for AliCDN | N | 5 files changed | 1 insertion(+) | 252 deletions(-) | |
bbc9885a Upstream | fix func name | Unknown: Support for AliCDN | N | 1 file changed | 10 insertions(+) | 11 deletions(-) | |
92a64367 Upstream | rename the metrics label | Trivial (requires 76da6290) | N | 1 file changed | 3 insertions(+) | 3 deletions(-) | |
d5a615b8 Upstream | update the event number | Trivial | N | 1 file changed | 4 insertions(+) | 4 deletions(-) | |
09a63caa Upstream | run go fmt and goimports | Not Needed (Whitespace changes already made) | N | 3 files changed | 15 insertions(+) | 15 deletions(-) | |
76da6290 Upstream | add label to the metrics | Easy | N | 4 files changed | 17 insertions(+) | 15 deletions(-) | |
48818fde Upstream | Remove err nil check | Not Needed (cleans up cleaned up error handling) | N/A | N | 1 file changed | 7 insertions(+) | 9 deletions(-) |
da8db466 Upstream | Fix gometalint errors | Not Needed (high effort for low impact) | N | 47 files changed | 92 insertions(+) | 240 deletions(-) | |
eb1a2cd9 Upstream | default autoredirect to false | Already Included as caf43bbc | N | 1 file changed | 7 insertions(+) | 4 deletions(-) | |
1251e51a Upstream | better name and updated tests | Not needed: changes relevant only to 9ebf151a | N | 3 files changed | 44 insertions(+) | 20 deletions(-) | |
9ebf151a Upstream | API to retrive tag's digests | Not needed: Database will not keep historical tag data | N | 3 files changed | 127 insertions(+) |
Generated by:
git cherry-pick --quit >/dev/null 2>&1; git log --oneline --no-merges upstream/master ^release/2.8-gitlab | cut -d" " -f1 | xargs -d $'\n' sh -c 'for arg do git show --format="|%h [Upstream](https://github.com/docker/distribution/commit/%H)|%s|Undetermined|N/A|" -s "$arg" | tr -d "\n" ; git cherry-pick $arg > /dev/null 2>&1; rebase_rc=$? ; git cherry-pick --quit > /dev/null 2>&1; git reset --hard release/2.8-gitlab > /dev/null 2>&1; printf $rebase_rc\| | tr 01 YN; git diff --shortstat "$arg"^ "$arg" | sed "s/, /\|/g"; done' | awk -F"|" 'BEGIN{ OFS="|"; ORS="|\n"} { if ($6 != "Y") print $0 }'
Edited by Hayley Swimelar