docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
15,920 Commits 12 Branches 296 Tags
c5eb072fd3900ea37df30cfde4e518e6d5909d23
Commit Graph

278 Commits

Author SHA1 Message Date
Mary Anthony
aa1b60b2be Updating after the pr went through 
Updating with comments.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3ce27975413a06a76dbdf720aadecf7f04fb6bba
Component: engine
 2015-06-01 09:20:31 -07:00
Joe Gordon
7716bbfe5b Fix spelling mistakes in documentation 
While reading  some of the docs I noticed a few errors, so I ran
misspellings (https://pypi.python.org/pypi/misspellings) on markdown files

Signed-off-by: Joe Gordon <joe.gordon0@gmail.com>
Upstream-commit: 3d87b80b46d45c2ca7c0fbcbcbb3fcf97a48444b
Component: engine
 2015-05-31 11:53:23 -07:00
Doug Davis
cc848c594e Add a "Created" state for new containers that haven't been run yet 
Closes #13353

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: dc697b1c9f2bf77b5b78aa871e3f365e333fd253
Component: engine
 2015-05-30 07:48:46 -07:00
Antonio Murdaca
6226136075 Remove PortSpecs from Config 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 15134a3320fbacee36e86a0342e7ffb49285f297
Component: engine
 2015-05-29 22:38:09 +02:00
Antonio Murdaca
8d306cf8a5 Add syslog-address log-opt 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e8c88d253337776a6075c9db69140ce2c5014622
Component: engine
 2015-05-29 00:42:11 +02:00
Dan Walsh
1adf295b9a Modify volume mounts SELinux labels on the fly based on :Z or :z 
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.

Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 160dc79db095767de74deb75b8e1ae86f213593c
Component: engine
 2015-05-27 12:50:16 -07:00
Jessica Frazelle
d89704cf56 Revert "Add docker exec run a command in privileged mode" 
This reverts commit 72a500e9e5929b038816d8bd18d462a19e571c99.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
Upstream-commit: 40b71adee390e9c06471b89ed845132b4ec80177
Component: engine
 2015-05-26 14:12:16 -07:00
James Turnbull
6497871310 Merge pull request #13467 from epc/epc-2015145 
Documentation Copy edits for typos
Upstream-commit: 628c3965554484c4585b9ff67c9e64f541414057
Component: engine
 2015-05-25 14:32:17 -04:00
Ed Costello
08e38fdc3f Copy edits for typos 
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: 7d75c5be95cb51a0d61862988bf263d3f8525d3e
Component: engine
 2015-05-25 13:39:56 -04:00
Nate Jones
23b19da74f mention dockviz alternative 
closes #13431

Signed-off-by: Nate Jones <nate@endot.org>
Upstream-commit: 453c0abf1c08e71c14ae6809a6e4b0d08a31e245
Component: engine
 2015-05-25 09:43:25 -07:00
David Calavera
50f6b1411a Document missing build flags. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a85b09d8a40456fb5f3b72b7b1999cd9df08c082
Component: engine
 2015-05-21 15:02:00 -07:00
Shishir Mahajan
7f98a41593 root dir for execdriver (/var/run/docker) should be configurable 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 8b2c6cb0729eadb09d688241e0f5debf1d5ccb0b
Component: engine
 2015-05-15 09:30:36 -04:00
Darren Shepherd
dc9bbf77b5 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: f2e5207fc989288ad136d48222df8e7754eb0e9b
Component: engine
 2015-05-13 17:56:32 -07:00
Sebastiaan van Stijn
b60e82567d Merge pull request #12362 from ahmetalpbalkan/logs/since 
Add --since argument to docker logs cmd
Upstream-commit: d0459abe6e29548c6df045483f08797840620b0a
Component: engine
 2015-05-12 09:40:16 -04:00
Jessie Frazelle
84543fc3ec Merge pull request #13074 from runcom/11824-short-link-if-equals-alias 
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
 2015-05-11 13:18:29 -07:00
Antonio Murdaca
60d5f903de Allow links to be specified with only the name if this matches the alias 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
 2015-05-11 21:50:47 +02:00
Ahmet Alp Balkan
365c18080f Add --since argument to docker logs cmd 
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.

Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
 2015-05-10 20:42:14 +00:00
Ma Shimiao
560ba9b809 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
 2015-05-09 10:02:46 +08:00
Jessie Frazelle
5c2686119c Merge pull request #11802 from hqhq/hq_add_blkio_weight 
add blkio.weight support
Upstream-commit: de32f5c431bbdb56d6a446af0e5660fae9539bd8
Component: engine
 2015-05-07 17:10:39 -07:00
Jessie Frazelle
2ee6387cbc Merge pull request #12165 from icecrime/optional_userland_proxy 
Optional userland proxy
Upstream-commit: 74bfa3675353aaf10ca760e82a79d758bea0ff6b
Component: engine
 2015-05-07 14:01:16 -07:00
Qiang Huang
4f3515319b add blkio.weight support 
We can use this to control block IO weight of a container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f133f11a7d25e6262558dd733afaa95ddd1c7aee
Component: engine
 2015-05-07 11:55:58 +08:00
Tibor Vass
da6438ab18 Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
Upstream-commit: 91fb4d672a8536d2f0437aeeb2dfc7b9e51aac16
Component: engine
 2015-05-04 22:28:01 -07:00
Arnaud Porterie
d7e8665b03 Add --userland-proxy daemon flag 
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.

Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f42348e18f73d1d775d77ac75bc96466aae56d7c
Component: engine
 2015-05-04 16:07:45 -07:00
Brian Goff
9531505238 Allow pulling stats once and disconnecting. 
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f3023a93d1a0a96a7312de441a550c758ac0c17d
Component: engine
 2015-05-04 10:49:13 -04:00
HuKeping
ad3d66108b Feature: option for disable OOM killer 
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
 2015-05-04 21:11:29 +08:00
Jessie Frazelle
ce3a344378 Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups 
Option to configure cgroup manager (adds --exec-opt)
Upstream-commit: 53bef64804c6dae6662a7d55c3bb3e48b3e5dfdf
Component: engine
 2015-04-29 10:00:41 -07:00
Jessica Frazelle
1a116000d5 option to configure cgroups 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 2afcd10202283478cbafb21e8c5f90f1236acccc
Component: engine
 2015-04-27 17:50:39 -07:00
Jessica Frazelle
7b559d4a5f Add docs for --exec-opt and setting native.cgroupdriver. 
update man pages.
update bash completion.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: d4bbbe58ddd5916c5f7d253a90fd97e3a4fd59bf
Component: engine
 2015-04-27 17:04:28 -07:00
Zhang Wei
25e6857dc9 improve docker man page 
fix issue #12708:
"docker man page is misleading about format of commands"

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 29f379ea6e2a68d8ac4bf41d3559a52066a275a0
Component: engine
 2015-04-27 23:27:35 +08:00
Lei Jitang
734115a06e Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5f4fb8be006c0ffeff2671e5752111e543e07d9f
Component: engine
 2015-04-24 08:54:08 +08:00
Dan Walsh
bfa8bbb7bb Merge branch 'master' of github.com:docker/docker into journald 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: b88b2fa72ea4ad579478080ce6f027e55cfd5c29
Component: engine
 2015-04-22 17:37:26 -04:00
Fred Lifton
60a0268238 Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc 
Remove some unsupported instructions in the docs.
Upstream-commit: 21c8d211e1bd508091c1dfecb29a32988ac2a17a
Component: engine
 2015-04-21 14:08:31 -07:00
Dan Walsh
b04ccc089c Add journald as a supported logger for containers 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 364287b74118de4f04d049426ef37fa9936d2065
Component: engine
 2015-04-21 12:57:54 -04:00
Jessie Frazelle
cff18dc122 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
 2015-04-20 17:55:01 -07:00
Jessie Frazelle
23af23a14a Merge pull request #12430 from icecrime/11551_carry 
Add -H|--human command-line flag to `docker history`
Upstream-commit: 47b703593efa10489f39b2396081fa65d12ccae4
Component: engine
 2015-04-20 17:28:24 -07:00
Lei Jitang
f8f4bcdb38 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
 2015-04-20 08:16:47 -07:00
Sylvain Baubeau
6f062d5e99 Allow specifying a default gateway for bridge networking 
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
Upstream-commit: acb6127c1a3f7054c25d1468b67f2eb269f4ecbf
Component: engine
 2015-04-20 15:13:30 +02:00
Shijiang Wei
96f82039c1 Remove some unsupported instructions in the docs. 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 49be84842e41a612601ff9d0563ec30f138e95bc
Component: engine
 2015-04-20 16:48:17 +08:00
Mary Anthony
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
Qiang Huang
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
Arnaud Porterie
10d974ead9 Add -H|--human flag to docker history 
Add a flag to print sizes and dates in human readable format.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ae5cf30c7c6630d201ef14e2e460f4164f58a261
Component: engine
 2015-04-16 08:38:18 -07:00
Qiang Huang
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
wonderflow
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
Michael Crosby
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
Michael Crosby
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
Eric Windisch
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
jianbosun
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
Lei Jitang
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
Lei Jitang
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
Arnaud Porterie
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