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,316 Commits 12 Branches 296 Tags
ba0c92d010136e401d4441aaecb05a2e4e0bcdcb
Commit Graph

1001 Commits

Author SHA1 Message Date
Arnaud Porterie
f6876820fd Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
 2015-05-05 14:46:47 -07: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
Sven Dowideit
a3d3fbb773 spelling fix from Marc MERLIN 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: bba5fd8caa35d5edf8b68e593eafb277394a6989
Component: engine
 2015-05-05 00:38:41 +00:00
David Calavera
f81d4d4161 Merge pull request #12769 from calavera/git_build_fragment 
Use git url fragment to specify build reference and dir context.
Upstream-commit: 0a2ccb1cb54834d3b97982f93c42671be5861082
Component: engine
 2015-05-04 12:48:24 -07:00
Jessie Frazelle
366be0f240 Merge pull request #12865 from larsks/bug/12864 
journald log driver: use CONTAINER_ID field for container id
Upstream-commit: 0c1c2726876bdffad4e600456f07e256bc1361a1
Component: engine
 2015-05-04 10:53:58 -07:00
David Calavera
a0ae4df58b Use git url fragment to specify reference and dir context. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 49fd83a25e2e6604014de41d4f4099a7bc07a09b
Component: engine
 2015-05-04 09:28:06 -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
Lars Kellogg-Stedman
72fc3b7751 journald log driver: use CONTAINER_ID field for container id 
This patch modifies the journald log driver to store the container ID in
a field named CONTAINER_ID, rather than (ab)using the MESSAGE_ID field.
Additionally, this adds the CONTAINER_ID_FULL field containing the
complete container ID and CONTAINER_NAME, containing the container name.

When using the journald log driver, this permits you to see log messages
from a particular container like this:

    # journalctl CONTAINER_ID=a9238443e193

Example output from "journalctl -o verbose" includes the following:

    CONTAINER_ID=27aae7361e67
    CONTAINER_ID_FULL=27aae7361e67e2b4d3864280acd2b80e78daf8ec73786d8b68f3afeeaabbd4c4
    CONTAINER_NAME=web

Closes: #12864
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: 869ecba652294e069874c83591d6f1b469d7cc32
Component: engine
 2015-04-30 10:42:27 -04: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
buddhamagnet
bc3d7f1531 add support for exclusion rules in dockerignore 
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
Upstream-commit: 6fd8e485c85c4f8ca62578d0840bdeddc4cba151
Component: engine
 2015-04-28 18:56:45 +01: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
Daniel Nephin
b5c5cd32f2 Add missing API docs about filtering by label. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: cfd0f53b03d26c370e37abf651d7f481ee8c6912
Component: engine
 2015-04-26 15:36:01 -04:00
Marianna
b3b4c052f9 Make the docs for --cgroup-parent better 
Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: a8dfafc98642455ed83f9422f3174fa828dde4df
Component: engine
 2015-04-25 16:35:28 -04:00
Julien Barbier
9f2b2b3d39 Adding doc 
Signed-off-by: Julien Barbier <write0@gmail.com>
Upstream-commit: 81897adcee8813efdff8374a1f46125b7e094847
Component: engine
 2015-04-25 15:25:51 -04:00
Ed Costello
d7a0961327 Copy edits for typos 
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: fa9299f4c03cf097887db26dadcc63c711c925f1
Component: engine
 2015-04-25 15:01:05 -04:00
David Calavera
ecfd095619 Document the extra depth argument in git contexts. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 8bd5a95e1e39541dfc5dc635c5c8e7604fe10028
Component: engine
 2015-04-24 09:39:39 -07:00
Tristan Carel
63429192b7 Fix typo in builder reference 
Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
Upstream-commit: 47263c6514457d58c1062671077118063189d433
Component: engine
 2015-04-23 12:10:47 +02:00
Rick Wieman
701a9fb9a1 Makes headings in documentation consistent 
Fixes #10673.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 63593267619378520a03e8984c5fcf0ec8957537
Component: engine
 2015-04-23 07:41:30 +02:00
Alexander Morozov
03223ccad9 Merge pull request #12557 from rhatdan/journald 
Add journald as a supported logger for containers
Upstream-commit: 3dc07162bdb457c86c0d5025d1d633131fadcfd1
Component: engine
 2015-04-22 17:20:10 -07:00
Sven Dowideit
1563e7c4d1 Merge pull request #12513 from allingeek/patch-1 
builder.md - Changes to bring LABEL docs in line with 1.6 release.
Upstream-commit: b2aca01d95caea18480642f48aacbe43e283fd0c
Component: engine
 2015-04-23 08:58:59 +10: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
Arnaud Porterie
9d30ecdb29 Merge pull request #9381 from lebauce/default-gateway 
Proposal: Allow specifying a default gateway for bridge networking
Upstream-commit: 9838242db1890ae82dd63a6aae134147c74933ef
Component: engine
 2015-04-20 15:50:35 -07:00
Doug Davis
44c88b9112 Add .docker/config.json and support for HTTP Headers 
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 18c9b6c6455f116ae59cde8544413b3d7d294a5e
Component: engine
 2015-04-20 13:05: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
Jeff Nickoloff
b2ac76cbc3 Update builder.md 
Single value labels do not work in 1.6 and multi-label instructions only work when separated by non-EOL whitespace.
I also added an example snip from the inspect output with the labels that are included in this guide.

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>
Upstream-commit: 89df65be5d3ee72cd6e1b4aa53953a62f4b5d00a
Component: engine
 2015-04-18 11:38:20 -07: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
Mary Anthony
0e1a426ed8 In with the old menu layout 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fe8fb24b530016e56ab584526c093daccacf6040
Component: engine
 2015-04-15 19:02:01 -07:00
Brian Goff
ab74fc7837 Merge pull request #12387 from x1022as/inspect-logpath 
Inspect show right LogPath in json-file driver
Upstream-commit: f0c60f7085ea124c2d3660fae17c1d2ab7e4abb0
Component: engine
 2015-04-15 14:28:39 -04:00
moxiegirl
8f5db65c9f Merge pull request #12399 from emirozer/master 
closes #8945
Upstream-commit: 2499baefddb03e38b38a413a7290340a3f4b7420
Component: engine
 2015-04-15 10:53:10 -07:00
Emir Ozer
fc7bcaf7a1 closes #8945 
Signed-off-by: Emir Ozer <emirozer@yandex.com>
Upstream-commit: 960de9c8dd3d64dd4be0e851dd835e6d9427c70c
Component: engine
 2015-04-15 15:31:23 +02:00
Deng Guangxing
e04ea19d11 Inspect show right LogPath in json-file driver 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: acf025ad1b806fd9b5eb3358a8e1d75c6aae890d
Component: engine
 2015-04-15 11:51:24 +08:00
Qiang Huang
9f222f171d Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f8dc7e8754355c504562021da244c52055ab9204
Component: engine
 2015-04-15 09:34:12 +08: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
David Calavera
b524d0385e Fix JSON format in the remote api configuration examples. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d71c929d081c2fb7c33b36ae5db40014163f9b6c
Component: engine
 2015-04-13 16:12:00 -07: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
Bryan Boreham
426bfa8e61 Add a note about PID 1 not terminating on SIGINT/SIGTERM. 
Also re-arranged the description of CTRL-c to make it clearer.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 5ad15479a0f3ce804a44a6931b716b0fae22ac6d
Component: engine
 2015-04-13 17:39:38 +01:00
James Turnbull
6fd02194d0 Merge pull request #12289 from sunyuan3/docker_remote_api 
update docker_remote_api_v1.19.md
Upstream-commit: e3dd323336904c02aaf57a1ffe3dcc8cb666fc78
Component: engine
 2015-04-11 09:27:36 -05: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
Yuan Sun
dd126faafc update docker_remote_api_v1.* 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 4f492e794ae9c9a51edae4bb5873187eadab828e
Component: engine
 2015-04-11 18:11:49 +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