7cd85af5c7
Merge branch 'master' of github.com:docker/docker into joyentinstall
...
Reolved conflict in:
docs/mkdocs.yml
Signed-off-by: Casey Bisson <casey.bisson@joyent.com >
Upstream-commit: a71d89d041d7853698c84ccf233f477383a9dcb3
Component: engine
2015-03-22 18:19:27 -07:00
7d0f834cb3
Merge pull request #10903 from programmerq/docs_submodules
...
Update docs around private github submodules in automated builds.
Upstream-commit: cce196d64b50384a71a0fbf1f1026e8580ff9d15
Component: engine
2015-03-23 11:01:28 +10:00
2b2e612495
Merge pull request #11400 from ahmetalpbalkan/docs/azure
...
docs: Add Microsoft Azure installation instructions
Upstream-commit: cf7d093e17d89371cf375a5f66e8103d7dde6e3c
Component: engine
2015-03-23 10:03:00 +10:00
e1ebdbecb2
Updating in light of new contributors guide
...
Link to new guide. Added a quickstart contributor guide for experienced people.
Converting narrative style to procedures for easier use. I think there is something missing in the
release publishing section...but it looks like it was missing in the original.
Updates per thaJeztah
Edits per Fred
Updating with comments from Sven
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: fdbec264111ac20b06cdd9b885fe47415a6495e4
Component: engine
2015-03-22 11:55:32 -07:00
9e9a6a8f56
Fix typo in git setup doc.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: f5c60fc0fd4e0daa068134ab9a887f69c797bae7
Component: engine
2015-03-22 11:22:47 -04:00
3e6a579992
Update contributor docs and triage to match new labeling system
...
Add clarification around experience
Adding test
improvement > enhancement
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 3ff9991bb27b238b0df4f67b6714174ca92223eb
Component: engine
2015-03-21 15:55:33 -07:00
e8bf8127c1
docs: cli: reorder rename command to be in alphabetical order
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com >
Upstream-commit: fe21c7a4bebd5d6d0065e0529d03a03723fc697b
Component: engine
2015-03-20 14:51:39 -07:00
7772935737
updated text
...
per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939
Signed-off-by: Casey Bisson <casey.bisson@joyent.com >
Upstream-commit: 19e3db35039ae80409623266906093b2314bd970
Component: engine
2015-03-20 14:44:24 -07:00
f8785b1704
Merge branch 'master' of github.com:docker/docker into joyentinstall
...
Resolved conflict in the following file:
docs/sources/installation/MAINTAINERS
File was deleted upstream and changed in this branch. Deleting the file in this branch as well.
Signed-off-by: Casey Bisson <casey.bisson@joyent.com >
Upstream-commit: cb2280c98e3a2aa389b64adcafb30a446e2b6d24
Component: engine
2015-03-20 14:37:17 -07:00
50fc694c96
Merge pull request #11481 from jfrazelle/perms-on-release
...
cleanup docs/release.sh
Upstream-commit: d2cb3af75b5c8597be5cddfe15f1002f482870cf
Component: engine
2015-03-20 10:57:43 -04:00
40e97918dc
docs: Add Azure installation instructions
...
Adding instructions that refers to the Microsoft Azure
documentation on creating Docker-ready Linux VMs on Azure
platform.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 72fa3fcaeacfcfebdad463d965ff1d6a3e95d516
Component: engine
2015-03-19 21:28:29 -07:00
12a935da06
Small copy edits
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 32efa559a3b643df117222e998b2d9ab550b0060
Component: engine
2015-03-20 14:09:30 +10:00
b6cc2868a6
change perms on release and cleanup docs
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 844c0f154abff1fc6e9e3907b23d1f3d99b0e840
Component: engine
2015-03-19 21:07:02 -07:00
5e34656977
Merge pull request #11470 from albers/events-filter-name
...
Remove 'name' filter from docker events documentation
Upstream-commit: f574262ff74126f080a7e9bd16f0e4017761de94
Component: engine
2015-03-19 16:22:30 -07:00
2c047d4fdf
Merge pull request #11479 from falmp/patch-1
...
Fixed --read-only description indentation
Upstream-commit: 0d3da36a5f4362a0e5907d3d0a69ac66ded6b04f
Component: engine
2015-03-19 16:22:08 -07:00
586d8f70ba
Merge pull request #11498 from jbnunn/patch-1
...
Typo/grammar corrections to dockerizing.md
Upstream-commit: fcc87c0df0c3d5da72786db2df9dc6b4ed090a08
Component: engine
2015-03-19 16:21:29 -07:00
a5bb86caaa
Merge pull request #11428 from vishh/parent-cgroup
...
Adding '--cgroup-parent' option.
Upstream-commit: 455a272aef4e109ce57c20f9ea224e4d4b32ece7
Component: engine
2015-03-19 14:41:57 -07:00
cacba6788c
Optimize images
...
Optimized new screenshots, reduced file-size with 50%
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cf0634b937264afd1194600f3719d35f29ac0440
Component: engine
2015-03-19 10:01:43 -06:00
cc2fb5cc3f
Update docs around private github submodules in automated builds.
...
Signed-off-by: Jeff Anderson <jeff@docker.com >
Upstream-commit: 390dd4bf3f6e3c6b239d597467554a19b04dc89d
Component: engine
2015-03-19 10:01:43 -06:00
627077c4f9
Typo/grammar corrections to dockerizing.md
...
Added commas where necessary, edited typos to improve readability.
Signed-off-by: J. Nunn <jeffnunn@amazon.com >
Upstream-commit: a8faba021c569a53f03ed68b27d2f53db2d70f3d
Component: engine
2015-03-19 10:51:12 -05:00
a94170b2cb
Fixed --read-only description indentation
...
The wrong indentation was breaking documentation layout with code blocks.
Signed-off-by: Francisco Lopes <chico.lopes@gmail.com >
Upstream-commit: b311066d240e6f034c8a5749f01897739f26c7bb
Component: engine
2015-03-19 11:53:50 -03:00
07ba863c0f
Remove 'name' filter from docker events documentation
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ec7530afde3f45a31d51abe17f602a3c5dc6389e
Component: engine
2015-03-19 08:51:36 +01:00
a7ed4dc483
Merge pull request #11028 from jstangroome/patch-1
...
Correct IP/MAC address generation docs
Upstream-commit: 33bec0a7f63695d6fa60a79c8732d49623d30223
Component: engine
2015-03-19 01:44:43 -04:00
b21852214d
Adding integration tests for --cgroup-parent feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: c7267017e931cee8ecd0e8d88473f26a80a3314c
Component: engine
2015-03-19 02:34:42 +00:00
8bcedc4b44
Adding documentation for '--cgroup-parent' option.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: f7dd1333b5a6dfa34ce8b2fb15533f1aca6efdc3
Component: engine
2015-03-19 02:34:15 +00:00
793cdf14d1
Merge pull request #11410 from cpuguy83/10191_build_resources
...
Allow setting resource constraints for build
Upstream-commit: 2cde817458a6ff3d371406cf226552fbd4fd3de9
Component: engine
2015-03-18 21:44:21 -04:00
5e80a64076
Allow setting resource constrains for build
...
Closes #10191
Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e6ae89a45a699bd44f03517396777e34ec76018b
Component: engine
2015-03-18 20:57:13 -04:00
30161bd9a1
Merge pull request #11452 from jeffdm/master
...
Adding Kitematic link to Mac OS X install instructions in docs
Upstream-commit: 068d343ddfad23ca2f7b407f5be03803029ac311
Component: engine
2015-03-18 17:32:48 -07:00
545bbe667a
Adding Kitematic link to Mac OS X install instructions
...
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com >
Upstream-commit: 3ddf5d75179f529356f19acb77e46e97388d4490
Component: engine
2015-03-18 16:32:59 -07:00
a0dccb769e
Merge pull request #11328 from jfrazelle/fix-docs-release-script
...
Fix clear cache docs release.
Upstream-commit: 42f5c874254798c2e2bc8060939e48ade5c97e23
Component: engine
2015-03-18 16:06:27 -07:00
47d9382364
Merge pull request #11430 from jfrazelle/export_outputflag
...
Modified `docker export` to allow an --output flag
Upstream-commit: 8ec4e698395fb18ed6a6ec1f17798bc05230f0fa
Component: engine
2015-03-18 19:04:43 -04:00
ea8c209cf2
Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144
...
Clarify behavior of docker cp
Upstream-commit: 50bf3cbedc923985868bd84515460aad174dcccb
Component: engine
2015-03-18 08:46:52 -07:00
b486ed31bd
cleanup: docs: remove temporary inline styles
...
Some inline `<style>` tags were temporarily added to the documentation
because the documentation-stylesheets where not yet updated to the
latest version (see https://github.com/docker/docker/pull/11231 and
https://github.com/docker/docker/pull/11229#issuecomment-77698868 ).
This removes those temporary `<style>` tags.
depends on #11230 (https://github.com/docker/docker/issues/11230 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4e6a01023b7422dc3df7f02e248bb06361069fcc
Component: engine
2015-03-17 22:48:28 +01:00
cf394b41e4
# This is a combination of 2 commits.
...
# The first commit's message is:
Updating Ubuntu installation to use wget; eliminating elo
Signed-off-by: Mary Anthony <mary.anthony@docker.com >
# This is the 2nd commit message:
Adding in James comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: f60ed98e79fbc91e7aa280769c62c5a59c7eba00
Component: engine
2015-03-17 10:15:46 -07:00
176e29d9be
Fixing it back
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 241579a34faed177100f407465a6ae47bb5b98d2
Component: engine
2015-03-17 10:07:09 -07:00
d3fdbf9469
Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882
...
Return of the Ring: Metadata Labels Doc Tweaks
Upstream-commit: 2ab105e9fe604bb709dfaf25a19f4af003a8ddad
Component: engine
2015-03-17 09:47:36 -07:00
90fc12f567
Merge pull request #10568 from LK4D4/logging_drivers
...
Logging drivers
Upstream-commit: 1ff5a91007f01d2d61a7b2066db2e164085f0d1b
Component: engine
2015-03-17 09:45:58 -07:00
d6d379e87a
Add ability to refer to image by name + digest
...
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.
Signed-off-by: Andy Goldstein <agoldste@redhat.com >
Upstream-commit: a2b0c9778feac970524b98ef7a91b5528fdeb9d5
Component: engine
2015-03-17 10:10:42 +00:00
c16863b9b6
Modified docker export to allow an --output flag
...
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Added an --output flag to docker export and created tests.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net > (github: jfrazelle)
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Added text to reflect a new output option for the export command.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Whitespace clean up
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Added man page documentation for the new --output flag in export
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Upstream-commit: 5ff122f79713f177c07dbc43bb81f991243472d5
Component: engine
2015-03-17 00:20:19 -07:00
43ac3e6d56
Updating with Sven's comments and other tweaks
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6ddfe883dd0d6ce1f97a121652927ac1b1dbaefe
Component: engine
2015-03-16 21:49:33 -07:00
5f00f97ea0
Merge pull request #9882 from ibuildthecloud/labels
...
Proposal: One Meta Data to Rule Them All => Labels
Upstream-commit: b6ac111abfbed628a80b67f0b092a248083b354c
Component: engine
2015-03-16 20:20:05 -07:00
6b3727b132
Merge pull request #11429 from tianon/eval-shellinit
...
Add "eval" to every invocation of "boot2docker shellinit"
Upstream-commit: 97a5c584b3c917a5877012b2d4c1a00e5bb32479
Component: engine
2015-03-16 21:19:50 -04:00
9d08a2eb1e
Merge pull request #11239 from thaJeztah/docs-tables-in-run-reference
...
docs: use more tables in run reference and minor fixups
Upstream-commit: da24ba42e2717bb5d8765c8ba42cd4aeaa7a8ec6
Component: engine
2015-03-16 18:02:42 -07:00
873a2edf47
Merge pull request #11210 from xuhdev/patch-1
...
Update doc: "docker create" must specify a command
Upstream-commit: e6b18cb66d88e7b4f3762e74ee963c984185df33
Component: engine
2015-03-16 17:43:17 -07:00
1211b3d022
Add "eval" to every invocation of "boot2docker shellinit"
...
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 200123b317cd1bad052d3c503278d03d712e4812
Component: engine
2015-03-16 18:27:59 -06:00
dfdd70de33
Merge pull request #11203 from rhatdan/Dockerfile
...
We had some testers who found a hard to diagnose bug in Dockerfile
Upstream-commit: f4f10cf43ba1298284dcab926b2594bafda1087a
Component: engine
2015-03-16 17:26:18 -07:00
df4aae20f1
Merge pull request #10723 from SvenDowideit/takeover-10653
...
Update sample systemd for container
Upstream-commit: 44e9715e46db46d9c88b5bba6072c0fe42aa5837
Component: engine
2015-03-16 17:18:57 -07:00
1bcf6f53fe
Merge pull request #10816 from SvenDowideit/docker-build-return-code
...
Add some information about the docker build return code
Upstream-commit: c7f5ee9d695f336ad2c273ceebdf2fe3257f673f
Component: engine
2015-03-16 17:18:26 -07:00
845f59abb0
Documentation changes for labels
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: fae92d5f0a1d81a48dc210d5ae28ef83c724b5ac
Component: engine
2015-03-16 17:08:40 -07:00
526e8c6e31
Merge pull request #10591 from duglin/ErrUnknownCmd
...
Generate an error on unknown Dockerfile instruction
Upstream-commit: 085054db9d8850a7d2c8658bb9a7fdacf7a3ceb8
Component: engine
2015-03-16 17:47:28 -04:00
