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
28,328 Commits 12 Branches 296 Tags
b8d232c6a7241143c73fce489bb596f60cc968ad
Commit Graph

3994 Commits

Author SHA1 Message Date
Brian Goff
39c0d0f084 Merge pull request #27648 from dnephin/swagger-gen-operations 
Generated more api types from swagger spec
Upstream-commit: 2fc760496b24cc1d42d5527ec593b0e1b1701d54
Component: engine
 2016-10-31 15:33:16 -04:00
Daniel Nephin
2c5782817e Generate ContainerWait response from the swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 181562c2e54225d6ce737d98b03d3157451a5dbc
Component: engine
 2016-10-31 11:19:53 -04:00
Daniel Nephin
913e9a48c1 Generate container create response from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bad849fc826b410c3aeb753a8c7f6b38f7ae12b0
Component: engine
 2016-10-31 11:16:02 -04:00
Daniel Nephin
dc10e9a664 Use a config to generate swagger api types 
Moves the resposne types to a package under api/types

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 29df3bdb117a058ae040686dd0f2565ae9ad743a
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
d19255532a Generate VolumesCreateRequest from the swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5c2498fd3c41f4badb1788665886d30772537f73
Component: engine
 2016-10-31 11:13:41 -04:00
Daniel Nephin
31c5c30bb3 Generate VolumeList response from the swagger spec 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d459e83b1c993d63d5f94b85a7f8ddf3ac01beae
Component: engine
 2016-10-31 11:13:41 -04:00
John Howard
27e4d0d0fb Windows: Fix COPY file . after WORKDIR 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f0b93b6ed8b4c0776065be972b4d5b4611f25fbf
Component: engine
 2016-10-30 13:12:27 -07:00
Qiang Huang
34bac6f06e Fix bunch of typos 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
 2016-10-29 15:03:26 +08:00
Vincent Demeester
0be42defbd Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format 
Fixes #24022 - Adds container health support to docker ps filter/format
Upstream-commit: 515e5dade7a006dbd2c42880f1af695da22ece60
Component: engine
 2016-10-29 06:56:06 +02:00
Sebastiaan van Stijn
092d6f43e2 Merge pull request #27867 from Microsoft/jjh/difftest 
Windows: Port a docker diff test
Upstream-commit: a0eae7e3c0e037f73445a4f77a4dfcd1042be75c
Component: engine
 2016-10-28 16:44:03 -07:00
Michael Crosby
7523d02582 Merge pull request #27800 from lilybguo/group-add-rm 
Service create --group param
Upstream-commit: 91f477b8309fd09f27d613c1c3bfc7afb2fd137c
Component: engine
 2016-10-28 14:01:53 -07:00
Sebastiaan van Stijn
d280390d0c Merge pull request #24725 from yongtang/24693-dockerfile-empty-line-after-escape 
Fix dockerfile parser with empty line after escape
Upstream-commit: c5adc271b2991c1eb8a25cdab14e425edb2cd99b
Component: engine
 2016-10-28 13:53:15 -07:00
Lily Guo
ed2e1f6e2b Service create --group param 
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646

Signed-off-by: Lily Guo <lily.guo@docker.com>

Update flag documentation

Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups

Signed-off-by: Lily Guo <lily.guo@docker.com>

Fix docs for groups and update completion scripts

Signed-off-by: Lily Guo <lily.guo@docker.com>
Upstream-commit: 2f58494ae6e796325329f849cf547bcf94bb68e3
Component: engine
 2016-10-28 13:26:31 -07:00
Josh Horwitz
5b866e7f54 Adds container health support to docker ps filter 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: 1a149a0ea59b6653e0ba14599476bfe19c4c33f3
Component: engine
 2016-10-28 15:43:04 -04:00
John Howard
66e7a8f02f Windows: Port a docker diff test 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5cab19a08b9a29a22ee956de4520fceab2be5e3b
Component: engine
 2016-10-28 12:21:54 -07:00
Michael Crosby
3b745bdb00 Merge pull request #26464 from vdemeester/11065-stop-signal-and-restart-policies 
Taking stop-signal into account when docker kill
Upstream-commit: 9e436c9aad389de27f008cbf404fd907b23baa25
Component: engine
 2016-10-28 11:08:55 -07:00
Vincent Demeester
bf7ee1cb20 Merge pull request #26837 from AkihiroSuda/newtmpfs 
api: add TypeTmpfs to api/types/mount
Upstream-commit: 87ddc8b0a51248da4f9ab60b92901425c888282f
Component: engine
 2016-10-28 19:21:26 +02:00
Akihiro Suda
ecffd5b73a api: add TypeTmpfs to api/types/mount 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 18768fdc2e76ec6c600c8ab57d2d487ee7877794
Component: engine
 2016-10-28 08:38:32 +00:00
Vincent Demeester
dad340cfb8 Merge pull request #25800 from vdemeester/25798-fix-event-actions 
Fix 25798 : Allow "partial/prefix" filter for health_status, exec_create and exec_start events
Upstream-commit: 10d77b878c473d5e85318aa889a74f1a31559bea
Component: engine
 2016-10-28 05:20:49 +02:00
Vincent Demeester
5c99e2a951 Merge pull request #27805 from Microsoft/jjh/fixbuildercache 
Windows: Fix builder cache bug
Upstream-commit: 9e206b551288c5197a2523ad0f887341972d75c8
Component: engine
 2016-10-28 02:49:40 +02:00
Sebastiaan van Stijn
fede704b07 Merge pull request #25820 from crosbymichael/prom 
Add metrics output to docker
Upstream-commit: 33474a11fea50d50c1d365b29b94b978b2b6fff7
Component: engine
 2016-10-27 16:44:26 -07:00
Vincent Demeester
781e5170af Fix some event filtering 
Make it possible to use health_status, exec_start and exec_create as
is in event filter. This way, using `health_status` as filter will allow
to get all health_status events (healthy, unhealthy, …) instead of
having to us all combination (`health_status: healthy`, `health_status:
unhealthy`, …). Same goes for `exec_start` and `exec_create`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 71d8313ad415b8ec6efff3e88f48b5465f30c9a9
Component: engine
 2016-10-27 16:14:13 -07:00
Sebastiaan van Stijn
2c36e772da Merge pull request #24844 from yongtang/24712-create-service-env-file 
Add `--env-file` flag to `docker create service`
Upstream-commit: 322f88f3679efa3267e3ea01330fbedfeb059e9a
Component: engine
 2016-10-27 13:40:51 -07:00
Kenfe-Mickaël Laventure
47fed3161f Merge pull request #26718 from ncdc/add-logs-to-container-attach-options 
Add Logs to ContainerAttachOptions
Upstream-commit: 4d2e258531a4c3f2e042c6dda79463b46f1b5880
Component: engine
 2016-10-27 13:32:50 -07:00
John Howard
6ef00270be Windows: Fix builder cache bug 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4f3889e4be9fe518e9be73306a8716c3a5f4b1c6
Component: engine
 2016-10-27 12:27:30 -07:00
Yong Tang
bf6f304cc7 Add --env-file flag to docker create service 
This fix tries to address the issue in 24712 and add
`--env-file` file to `docker create service`.

Related documentation has been updated.

An additional integration has been added.

This fix fixes 24712.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ee3105c68a94411f2c019324bd71c56e9663a80d
Component: engine
 2016-10-27 11:48:32 -07:00
Yong Tang
bad2fec338 Fix dockerfile parser with empty line after escape 
This fix tries to fix the bug reported by #24693 where an empty
line after escape will not be stopped by the parser.

This fix addresses this issue by stop the parser from continue
with an empty line after escape.

An additional integration test has been added.

This fix fixes #24693.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 3e1b539e8d0ed4abf695b0a8c42346fba6d5a6b0
Component: engine
 2016-10-27 10:43:08 -07:00
Michael Crosby
2a9003b823 Add basic prometheus support 
This adds a metrics packages that creates additional metrics.  Add the
metrics endpoint to the docker api server under `/metrics`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add metrics to daemon package

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

api: use standard way for metrics route

Also add "type" query parameter

Signed-off-by: Alexander Morozov <lk4d4@docker.com>

Convert timers to ms

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 3343d234f3b131d4be1d4ca84385e184633a79bd
Component: engine
 2016-10-27 10:34:38 -07:00
Sebastiaan van Stijn
b63aa05761 Merge pull request #27702 from tonistiigi/net-builder0 
add --network option for docker build
Upstream-commit: 62ff3e90835c3c572051afbbbac53303e57a5c89
Component: engine
 2016-10-25 21:50:33 -07:00
Brian Goff
54d7e7421f Merge pull request #27503 from Microsoft/validcredspec 
Windows: Add cred spec test with well form credentials
Upstream-commit: 6e462412d721525ee85f8a8874e933f16d0a27ce
Component: engine
 2016-10-25 13:44:52 -07:00
Sebastiaan van Stijn
8309d31c1c Merge pull request #27644 from Microsoft/jjh/builderslash 
Windows: Honour escape directive fully
Upstream-commit: 0797e3f61a0402112c00de7b4042fdf3093050a7
Component: engine
 2016-10-25 11:52:13 -07:00
Tonis Tiigi
ca14deb769 Add integration tests for build with network opts 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e3b48fca0db71cc24270dcf254590541279980d4
Component: engine
 2016-10-25 10:25:42 -07:00
Akihiro Suda
4fb550ce0f add docker network prune 
`docker network prune` prunes unused networks, including overlay ones.
`docker system prune` also prunes unused networks.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 7e24c16086a9a4f38e241e51837f2be4877c04a6
Component: engine
 2016-10-25 06:43:54 +00:00
Aaron Lehmann
082a38d3c8 Merge pull request #27703 from aaronlehmann/fix-test-name 
integration-cli: Fix style of swarm test name
Upstream-commit: 4882c263c6223ace5272c6d5c203c79e73e6ffcb
Component: engine
 2016-10-24 18:23:33 -07:00
Sebastiaan van Stijn
cf0e8d8d85 Merge pull request #24533 from yongtang/24392-docker-info-label-duplicate-keys 
Remove duplicate keys in labels of `docker info`
Upstream-commit: 411e7b4416fbac0601db1fa28b5152c23fcaf7bb
Component: engine
 2016-10-24 18:12:28 -07:00
Sebastiaan van Stijn
11895badbe Merge pull request #27223 from mlaventure/merge-experimental 
Make experimental a runtime flag
Upstream-commit: ba41a5edac16857121779434cd80b86dcdb0ffda
Component: engine
 2016-10-24 16:58:32 -07:00
Aaron Lehmann
eb042db21d integration-cli: Fix style of swarm test name 
A recent change fixed integration tests to use "API" in test names
instead of "Api". A new test was added in a PR opened before this
change, and didn't benefit from the cleanup. Fix its name.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 073d8115871f15ad36b6ab34e2af1f8f22ec333f
Component: engine
 2016-10-24 16:45:17 -07:00
Kenfe-Mickael Laventure
9a299b360f Make experimental a runtime flag 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
 2016-10-24 15:20:01 -07:00
Vincent Demeester
dee80812af Merge pull request #26354 from KingEmet/fixbranch 
make GetAll use client.List as the source of truth
Upstream-commit: 67b85f9d26f1b0b2b240f2d794748fac0f45243c
Component: engine
 2016-10-24 14:25:24 -07:00
Vincent Demeester
051c4d005f Taking stop-signal into account when docker kill 
If a container sets a stop-signal, taking it into account to disable or
not the restart policy.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d2e64247e6dfd3257a7d015890aa2f168ff643a0
Component: engine
 2016-10-24 11:10:14 -07:00
John Howard
04213eed5f Merge pull request #27616 from Microsoft/jjh/microsoftprefix 
Windows: Overhaul Dockerfile.windows and test image name
Upstream-commit: 935d4d1c179259a262eb15fbf7e2bba2df26d740
Component: engine
 2016-10-22 13:01:40 -07:00
Sebastiaan van Stijn
0e42edc6fd Merge pull request #27630 from runcom/fix-info-route 
api/server/router/system: fix info versioning
Upstream-commit: b54a1d83fa9ea3c1d2903138b7f9cd04f8557c20
Component: engine
 2016-10-21 18:58:10 -07:00
Sebastiaan van Stijn
2a18c9fa95 Merge pull request #26973 from allencloud/change-code-in-container-restore 
change code in container restore
Upstream-commit: a6688959b4d574994f29af43d263caa83ee89ed2
Component: engine
 2016-10-21 18:53:37 -07:00
Sebastiaan van Stijn
36c938c12b Merge pull request #27117 from dnephin/swagger-gen 
Add swagger.yaml and generate a few types from the spec
Upstream-commit: 3c385b9f6b820ae3badfbdcca589377e9a75e7fb
Component: engine
 2016-10-21 18:15:28 -07:00
John Howard
87b7e2db81 Windows: Update Dockerfile.windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9a19bd1b450a4f514d194d8a5571ab5be921464a
Component: engine
 2016-10-21 16:06:29 -07:00
John Howard
adbaf3869a Windows: Honour escape directive fully 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 912781841422363219e064a1df6df39dabf4cd81
Component: engine
 2016-10-21 14:22:14 -07:00
Antonio Murdaca
32b1cab2c4 api/server/router/system: fix info versioning 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 63b5a372037081175ab4ea8f3c7a7bef2195ec0b
Component: engine
 2016-10-21 12:32:23 +02:00
Aaron Lehmann
6c158febcb Merge pull request #27613 from stevvooe/archive-package-cleanup 
pkg/archive: remove unnecessary Archive and Reader type
Upstream-commit: bc52939b0455116ab8e0da67869ec81c1a1c3e2c
Component: engine
 2016-10-20 20:56:23 -07:00
Stephen J Day
fe1dce6a91 pkg/archive: remove unnecessary Archive and Reader type 
The `archive` package defines aliases for `io.ReadCloser` and
`io.Reader`. These don't seem to provide an benefit other than type
decoration. Per this change, several unnecessary type cases were
removed.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: aa2cc18745cbe0231c33782f0fa764f657e3fb88
Component: engine
 2016-10-20 19:31:24 -07:00
Aaron Lehmann
56af301200 Merge pull request #27287 from mavenugo/pluginv2-sk2 
Allow multiple handlers to support network plugins in swarm-mode 
Upstream-commit: 2c620d0aa24c5f774a9115449a86b158b005bba8
Component: engine
 2016-10-20 13:43:04 -07:00