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

Upgrade Docker container to 4.6.5 #856

Closed
wants to merge 4 commits into from

Conversation

ms32035
Copy link
Contributor

@ms32035 ms32035 commented Sep 17, 2017

Looks like this has been missed

@JC5
Copy link
Member

JC5 commented Sep 17, 2017

Hey man, thanks for the commit! I knew I forgot something. Unfortunately, I can't update the master branch. Could you edit your commit so it goes to the develop branch?

@ms32035 ms32035 changed the base branch from master to develop September 17, 2017 17:15
@ms32035
Copy link
Contributor Author

ms32035 commented Sep 17, 2017

Now it has conflicts as the docker container in develop is built with COPY from the repo. Besides, when the next version is released, this will have to be updated again. What do we do about it?

Or it might be because I branched this out of master, with intention to merge into master

@ms32035
Copy link
Contributor Author

ms32035 commented Sep 17, 2017

Yeah, merging this to develop does not make sense

@JC5
Copy link
Member

JC5 commented Sep 17, 2017

Mmm that's true. I'll have to close this and add it to my todo list for the next release. Is that ok?

@ms32035
Copy link
Contributor Author

ms32035 commented Sep 17, 2017

sure.

@ms32035 ms32035 closed this Sep 17, 2017
@ms32035 ms32035 deleted the docker_465 branch October 11, 2017 23:00
@lock lock bot locked as resolved and limited conversation to collaborators Jan 19, 2020
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