Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to current upstream master #1

Conversation

rwos
Copy link
Contributor

@rwos rwos commented Oct 11, 2018

Hi!

This is an update to upstream master (distribution/distribution@1cb4180), plus 0afef00, 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 0afef00.

Background: What I actually want to fix is teamhephy/workflow#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! :)

this recreates teamhephy@0afef00
on top of the current upstream master (1cb4180, which is v2.7.0-rc.0 plus two typo fixes)
@Cryptophobia
Copy link
Member

@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
Copy link
Contributor Author

rwos commented Oct 17, 2018

@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 pushed a commit that referenced this pull request Oct 19, 2018
Handle OCI manifests and image indexes without a media type

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
@Cryptophobia
Copy link
Member

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
Copy link
Member

@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.

…teamhephy/distribution into update-to-upstream-master
@rwos rwos changed the base branch from deis to chore/merging-in-docker-master-upstream October 22, 2018 08:58
@rwos
Copy link
Contributor Author

rwos commented Oct 22, 2018

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

@rwos
Copy link
Contributor Author

rwos commented Oct 22, 2018

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

Copy link
Member

@Cryptophobia Cryptophobia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Cryptophobia
Copy link
Member

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

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

@Cryptophobia Cryptophobia merged commit 1351df2 into teamhephy:chore/merging-in-docker-master-upstream Oct 22, 2018
@rwos rwos deleted the update-to-upstream-master branch October 23, 2018 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants