Commit Graph

239 Commits

Author SHA1 Message Date
d18c57d820 Docker Registry Server > Docker Registry
Fixing registry index
Tested on beta and this redirect works

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7b2b7df3866d0c0101e9367b7f4f63bfed5faac4
Component: engine
2015-04-18 19:19:48 -07:00
b54e42e0d3 update docker-inspect man page
- sort inspect out
 - update output fields
 - format output
 - add doc about go template
 - other minor fix

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 01548ed1dc25e94bf6cc7decca1d2045069dc5b1
Component: engine
2015-04-17 09:25:06 +08:00
4f6ebaa34e add support for cpuset.mems
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
2015-04-15 09:33:46 +08:00
01cea82b52 fix memory stats display document
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Upstream-commit: d791f7e9f81010299130ae8816ebe58667ea6b09
Component: engine
2015-04-14 18:34:20 +08:00
6165959ea5 Merge pull request #12025 from coolljt0725/add_exec_with_user
Add docker exec run command as a different user and in privileged mode
Upstream-commit: 12f7db18309950785e873119edb03e0a1621e7a3
Component: engine
2015-04-13 13:50:51 -07:00
483871b67f Merge pull request #12172 from ZJU-SEL/change_stats
change memory usage display
Upstream-commit: 6fa2a1e486797c1aa151e242902bed716347850f
Component: engine
2015-04-13 13:32:45 -07:00
589be08227 HTTPS URLs for docs top-level & man pages
This updates all of docs outside of sources.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: ac65c8c3801385c8278e0740ef2738b0aa56689a
Component: engine
2015-04-11 13:43:26 -04:00
ca227f7854 change memory usage display
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Upstream-commit: d6d8f45b04a6e6d0b616c85d1885342d3e676ec1
Component: engine
2015-04-11 20:04:34 +08:00
aaaa676179 Add docker exec run a command in privileged mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 72a500e9e5929b038816d8bd18d462a19e571c99
Component: engine
2015-04-11 11:26:37 +08:00
d1f2626097 Add -u|--user flag to docker exec for running command as a different user
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2cce4791b0e75201cb65daad07d4203d1c4c2996
Component: engine
2015-04-11 11:04:24 +08:00
fdca34bdb1 Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword
cli: Better wording for daemon --log-driver
Upstream-commit: 7cec5f50c51d91660c5b2ea2f4a9cf4dc6762b82
Component: engine
2015-04-10 08:29:29 -07:00
5ed91523df Rebase + some fixes
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: fa2ace00a833492123f7db1e2f867f70bab89be4
Component: engine
2015-04-09 21:29:42 -04:00
3ee56a6e4d Refine document by review comments
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: 8d682bf734539ade2d618349f82b8b5e83a87167
Component: engine
2015-04-09 21:29:42 -04:00
807d6f107a Add comment column in docker history command output
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: bf57339527f153b502a6443a495824a40768e39f
Component: engine
2015-04-09 21:29:41 -04:00
bc679a5419 cli: Better wording for daemon --log-driver
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.

Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: a4b7a9e1e5505983aea3f6d7e246c57a6f4f6170
Component: engine
2015-04-09 02:12:44 -07:00
a3cc1fb41c docs: add missing accent mark around docker command
As we did everywhere.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 809d99ad913fd73ae5da637c26f94879a6eb189c
Component: engine
2015-04-09 04:37:23 -04:00
5ce261de6c Carrying 11409 for a client
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fdfc36db416663e3c8434c031e01bd6211ce5d8b
Component: engine
2015-04-07 13:20:17 -07:00
142a5765d0 Merge pull request #11978 from x1022as/info-show-loggingdriver
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
2015-04-06 11:11:31 -07:00
42264ee36e Merge pull request #12020 from chenhanxiao/docker-import-commit
docs: keep the style of docker-commit consistent with docker-import
Upstream-commit: 96c3141fa5c81e3d672215d5bfcfb7534e96af2f
Component: engine
2015-04-06 09:47:47 -07:00
5eb5b13997 docs: keep the style of docker-commit consistent with docker-import
add a pair of accent mark around dockerfile commands
in docker-commit, as the same thing in docker-import.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 8fa03df8850c6eb3ecdce1266c72ed8d7af3a5bb
Component: engine
2015-04-02 05:01:14 -04:00
2fbe877abc Updating with man pages for distribution
Went through the man pages to update for the
v2 instance. Checked against the commands.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b6d55ebcbc93ce66aa9906aa87e1081f21ba1650
Component: engine
2015-04-01 21:02:19 -07:00
df6b8b71c3 Fix typoes in docker-run.1.md
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: a44451d40eb3e1b3d19a0525f70736406c66d2d1
Component: engine
2015-04-01 17:09:01 +08:00
5a7a97d2b6 docker info show logging driver info
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: f5a401d3fe2e8c74e6b6a38e9073b843b16fae68
Component: engine
2015-04-01 16:05:14 +08:00
6b249811ef Merge pull request #11678 from botchagalupe/docker-11465
Closes #11465 - Add additional doc for local registries on pull command
Upstream-commit: 41e47bbf34aa815fbc4fcec1247606b684bb9061
Component: engine
2015-03-29 14:10:20 -07:00
6446908d00 #11465 Add additional doc for locagi registries on pull command - for docker-pull.1.md
Signed-off-by: John Willis <john.willis@docker.com>
Upstream-commit: 2c07fd9fdf78842b4a09ff9a226bd57ba500f16b
Component: engine
2015-03-26 16:09:56 -04:00
e5276fe0a7 Removing sudo from command line examples
We now advise people to configure docker group and
add to sudo.  Mac shouldn't use sudo.  Removed sudo
from command examples.  Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 29d01b7ddedb5d1b5ec2262e2d961b737cbc6f38
Component: engine
2015-03-26 11:12:37 -07:00
c24a1cf195 Fix typo "WRKDIR" -> "WORKDIR"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6fdb583f3899362db13292ad3cad31fec970d638
Component: engine
2015-03-25 23:47:38 +01:00
f56d95c837 Merge pull request #11697 from pdxdan/7447-GID-Doc
Updated Dockerfile and docker-run documentation for USER commands
Upstream-commit: 4b4bdb5be58943c24ca64fd8b0b69cd259515a23
Component: engine
2015-03-24 09:17:41 -07:00
0b2b56ecf5 Add documentation about the semantics of docker login
Fixes #10550

Signed-off-by: Jesse Dearing <jesse.dearing@gmail.com>
Upstream-commit: ed0d2ac3b799b8f7b2508176e65bfe8583881c83
Component: engine
2015-03-23 23:53:50 -07:00
616291f1ff Added documentation for specifying groupname or GID for commands. Also clarified used of the possible use of multiple USER commands in a Dockerfile.
Signed-off-by: Dan Anolik <dan@anolik.net>
Upstream-commit: a57d7c5c796a1affcfa05ee6e7ea586750a9292f
Component: engine
2015-03-23 20:47:04 -07:00
dad3640059 Merge pull request #11458 from ibuildthecloud/syslog
Add syslog logging driver
Upstream-commit: 65e21f570358f46f6ad0f8fa2cd3394706ba169d
Component: engine
2015-03-23 11:34:33 -07:00
a7d21898b0 add syslog driver
Signed-off-by: wlan0 <sid@rancher.com>
Upstream-commit: eaecd8b1b5871a4d17be27e3615106587eec1d3a
Component: engine
2015-03-21 18:01:18 -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
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
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
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
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
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
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
a3cbef74ae Merge pull request #11364 from Mashimiao/update-manpage
Update docker manpage
Upstream-commit: 61e7efeadd3af1d9cf666866940d999ae7fd450b
Component: engine
2015-03-16 14:13:27 -07:00
86b5fcf410 Clarify behavior of docker cp
The STDOUT behavior of cp is not yet released in 1.50 so removed.
Also, tested against 1.5 all other behaviors and extended documentation to match.
Renamed HOSTPATH to HOSTDIR to give a self documenting name.

Adding back in the references to STDOUT
fix the command string
Entering Doug's comment re append and ~/tmp/foo in the glass
Adding in Doug's comments regarding PATHs and missing |-
Updating with James comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 9a78ed8f48f2d1404c4fadcb6116ffd46cd335f5
Component: engine
2015-03-16 12:44:28 -07:00