search

teamhephy / distribution

Apache License 2.0
0 stars 3 forks source link

Update to current upstream master #1

Closed rwos closed 6 years ago

rwos commented 6 years ago

Hi!

This is an update to upstream master (https://github.com/docker/distribution/commit/1cb4180b1a5b9c029b2f2beaeb38f0b5cf64e12e), plus https://github.com/teamhephy/distribution/commit/0afef00d5764404d70f86076f364551657d51de6, which I think was the only change (I re-commited that because I couldn't quite get git to do what I want).

Obviously, this diff is huge, but if you do a git remote add docker git@github.com:docker/distribution.gitand then do git diff docker/master, you'll see just this, which is essentially equal to https://github.com/teamhephy/distribution/commit/0afef00d5764404d70f86076f364551657d51de6.

Background: What I actually want to fix is https://github.com/teamhephy/workflow/issues/52 - I did that by adding an s3.endpoint values.yaml parameter, and using that everywhere (I currently have this all running locally, will do PRs to all the components over the next days).

That should have worked without updating this lib here, but - at least with the particular kind of S3-compatible storage I'm using - I ran into some sort of bug in the aws SDK or something, which disappeared after updating this. Also, maybe updating this dependency after 3 years isn't such a bad idea in general ;)

Let me know if there's questions about any of the above! :)

Cryptophobia commented 6 years ago

@rwos I will take a look at this repo and the changes and merge it soon. Will run a few test and see how everything goes.

rwos commented 6 years ago

@Cryptophobia if there's anything I can do to help, let me know!

A different approach would be to just kill the fork, and use upstream directly - but then we'd need to create the buckets manually in a couple of places. I'm not 100% sure whether that's more or less painful 😄

Cryptophobia commented 6 years ago

Hey @rwos , so gave my own merge a try to familiarize myself a bit with the code. Can you reopen your PR to my docker/master upstream branch chore/merging-in-docker-master-upstream? Let's see if we have any conflicts in our merge resolutions.

Cryptophobia commented 6 years ago

@rwos , there was a new commit on docker/master branch so when you get a chance just try to merge my branch chore/merging-in-docker-master-upstream on top of yours and resolve conflicts. Then open a PR and we will merge everything in if there aren't any other changes.

rwos commented 6 years ago

I did all that, I'll change the base branch for this PR once github stops being funny.

rwos commented 6 years ago

@Cryptophobia thanks! I changed the base branch here to point to yours.

Cryptophobia commented 6 years ago

@rwos, All the changes look good. I will merge your branch into mine and then merge mine into master. :+1:

Let me know if you need anything else for the next few PRs that you plan to open.