The git model uses `upstream master` to refer to the branch on
the remote repository, and `upstream/master` to refer to the
local cache of the upstream branch.
I did not explain the difference in the docs (that seemed a bit
excessive), but I did clarify the instructions so that it refers
to the correct concept in each place.
Signed-off-by: Katrina Owen <katrina.owen@gmail.com>
Upstream-commit: 54c9ae187f5a3544881650c09e923d67ed229771
Component: engine
Explain why advanced contribution workflow have to be so complex
Signed-off-by: Maxim Kulkin <mkulkin@mirantis.com>
Upstream-commit: b4d7b0f8657cd29147dd3215876b9f739ead7097
Component: engine
Add clarification around experience
Adding test
improvement > enhancement
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3ff9991bb27b238b0df4f67b6714174ca92223eb
Component: engine
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 949a21b55f3b8d7d1ae7a7b9829111a8f0dbf7e2
Component: engine
In fact, it doesn't work as the bare `\` backslashes are now preserved
and therefore are not valid regex matches on any test, making it not run
any tests at all. I assume at some point there was a process in the
pipeline that needed escaping, but on master (for quite a while) this
has not worked.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ed3f3835071496e9314d0e2a1806ac43f304decc
Component: engine
This cleans up the recently added project docs and
fixes some minor issues.
- remove inline styles where possible
- add redirects for renamed/replaced documents
- add styles for GitHub labels to match the style on GitHub
- fix minor markdown issues causing some code-blocks
to be shown as text
- wrap the documents to 80-chars
- use 4 spaces in stead of tabs for identing and remove
trailing whitespace/redundant blank lines
- optimized 'gordon' image
NOTE:
This alternative commit/PR re-introduces some inline
styles because the docs/base image has not yet been
updated for the current docs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: efc625fcd00b0f76e484d0bc081bafcfd789cfbb
Component: engine
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Optimize images, remove old file, add metadata tagging
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: 8c575f263dff23bec76dd0aa169e278fe4bfcb74
Component: engine
