Skip to content

Pull docker refs from git#511

Merged
johndmulhausen merged 2 commits intodocker:masterfrom
mdlinville:pull_docker_refs_from_git
Nov 19, 2016
Merged

Pull docker refs from git#511
johndmulhausen merged 2 commits intodocker:masterfrom
mdlinville:pull_docker_refs_from_git

Conversation

@mdlinville
Copy link

Describe the proposed changes

Remove docker/docker ref docs, plugin docs, and deprecated.md from docker.github.io source
Modify Dockerfile to pull these files/folders from the docker/docker repo instead
Modify the NOT_EDITED_HERE manifest to stop referring to these files / folders

Unreleased project version

n/a

Related issue

n/a

Related issue or PR in another project

n/a

Please take a look

@johndmulhausen I'm not sure exactly how to test this Can you sanity-check it?
cc/ @thaJeztah @dnephin

@johndmulhausen
Copy link
Contributor

johndmulhausen commented Nov 9, 2016

@mdlinville
Copy link
Author

@johndmulhausen @thaJeztah this is ready to go. We did some testing locally and verified that it works.

This is just for engine, and will need to be done separately for the others.

@mdlinville
Copy link
Author

cc/ @dnephin

@johndmulhausen
Copy link
Contributor

johndmulhausen commented Nov 10, 2016

@dnephin @thaJeztah @icecrime I just want to be really sure that this is necessary before we pull the trigger. You have said that after a version ships, the reference docs for that engine version are "dead" and that nobody is editing the v1.12 docs over in docker/docker at this point, correct?

@thaJeztah
Copy link
Member

You have said that after a version ships, the reference docs for that engine version are "dead" and that nobody is editing the v1.12 docs over in docker/docker at this point, correct?

Changes are made by cherry-picking fixes from the master branch into the 1.12.x branch. That way, we don't "maintain" two separate versions, but can incorporate changes in to the "current" docs (so are able to update documentation between releases).

Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

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

Dockerfile changes LGTM

@mdlinville
Copy link
Author

Rebased to address conflicts. I think this is ready to go. Agree, @johndmulhausen ?

@mdlinville
Copy link
Author

Argh let me rebase again.

Misty Stanley-Jones added 2 commits November 16, 2016 15:50
Update Dockerfile and NOT_EDITED_HERE manifest

Signed-off-by: Misty Stanley-Jones <[email protected]>
@mdlinville
Copy link
Author

@johndmulhausen I think this is ready (again)...

@johndmulhausen
Copy link
Contributor

Alright, pulling this in after discussion w/ @mstanleyjones. Thanks, all!

@johndmulhausen johndmulhausen merged commit 30772c6 into docker:master Nov 19, 2016
@mdlinville mdlinville deleted the pull_docker_refs_from_git branch March 6, 2017 18:09
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.

4 participants