docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
29,630 Commits 12 Branches 296 Tags
bd6bc03bbb09a1560f439d008213609dffd21340
Commit Graph

29630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
bd6bc03bbb Merge pull request #29237 from lixiaobing10051267/masterBreak 
add break when found in TestVolumeCLICreateWithOpts()
Upstream-commit: 16157034f64ca439966aefc07121c5b69339cd81
Component: engine
 2016-12-08 09:58:22 +01:00
lixiaobing10051267
b5c8edab7f add break when found in TestVolumeCLICreateWithOpts() 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: feadc5171a9ea5489964b0639135a1bd00e0eb8a
Component: engine
 2016-12-08 15:59:52 +08:00
Anusha Ragunathan
a09c35f1e8 Merge pull request #29191 from anusha-ragunathan/plugin_races 
Make v2/Plugin accesses safe.
Upstream-commit: 9d898b872ebe953cab1b60366253f1a9210764cc
Component: engine
 2016-12-07 17:52:44 -08:00
Tõnis Tiigi
b5155284d2 Merge pull request #29104 from duglin/Issue29084 
Fix processing of unset build-args during build
Upstream-commit: dca76ed50a02659ba7ca4e209356f138ff14dc3e
Component: engine
 2016-12-07 17:18:55 -08:00
Tõnis Tiigi
8efa0bf248 Merge pull request #29124 from ijc25/check-config-legacy-vsyscall 
Caution against the use of CONFIG_LEGACY_VSYSCALL_NATIVE
Upstream-commit: 1e92365a5fcfbbc9932abc8642a32cc3493eb2be
Component: engine
 2016-12-07 17:13:55 -08:00
Tõnis Tiigi
e048bb17f7 Merge pull request #29139 from ehazlett/fix-api-cors-exec 
Add headers when using exec
Upstream-commit: a039ca9affe5fa40c4e029d7aae399b26d433fe9
Component: engine
 2016-12-07 17:10:31 -08:00
Tõnis Tiigi
748c245257 Merge pull request #29190 from aaronlehmann/remove-registry-reference 
registry: Remove reference.go
Upstream-commit: c7d34a0ca5035788810660b840ceec098b698bd4
Component: engine
 2016-12-07 16:53:52 -08:00
Tõnis Tiigi
7f7cf89101 Merge pull request #29213 from yongtang/12072016-typo-swagger-yaml 
Fix a couple of incorrect version strings in swagger.yaml
Upstream-commit: 51b422ce6a398b579d97c2c3ae746275bd7204e5
Component: engine
 2016-12-07 16:47:49 -08:00
Michael Crosby
5c01c889af Merge pull request #29200 from coolljt0725/fix_attach 
fix #29199, reset container if container start failed
Upstream-commit: a42ca21f50d79beae04df3ceb47496dbed7632fd
Component: engine
 2016-12-07 15:21:28 -08:00
Vincent Demeester
2a1f61f581 Merge pull request #29062 from erxian/refine-api-swagger.yaml-towards-image-create-status-code 
refine api swagger.yaml towards image create status code
Upstream-commit: 9468d687ac924db8df95fd8d2bcbe7facafb8c2d
Component: engine
 2016-12-07 22:03:54 +01:00
Justin Cormack
69c140812c Merge pull request #29174 from lhsvobodaj/29132-add-build-args-to-build-deb-script 
Add variable DOCKER_BUILD_ARGS to build-deb script
Upstream-commit: 74ecec9199a2f1e9ff1ce52e254c8de65882ab4a
Component: engine
 2016-12-07 09:02:47 -08:00
Yong Tang
5e6532a1b8 Fix a couple of incorrect version string in swagger.yaml 
This fix fixes a couple of incorrect version strings in swagger.yaml
`v1.25` should be `v1.26`. This applies to 1.14 version only.

Also checked 1.13rc and it is fine.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 887c4188f469698938213eddd1babf224cc39737
Component: engine
 2016-12-07 08:11:12 -08:00
Doug Davis
ce009b27d8 Fix processing of unset build-args during build 
This reverts 26103.  26103 was trying to make it so that if someone did:
  docker build --build-arg FOO .
and FOO wasn't set as an env var then it would pick-up FOO from the
Dockerfile's ARG cmd.  However, it went too far and removed the ability
to specify a build arg w/o any value. Meaning it required the --build-arg
param to always be in the form "name=value", and not just "name".

This PR does the right fix - it allows just "name" and it'll grab the value
from the env vars if set. If "name" isn't set in the env then it still needs
to send "name" to the server so that a warning can be printed about an
unused --build-arg. And this is why buildArgs in the options is now a
*string instead of just a string - 'nil' == mentioned but no value.

Closes #29084

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: cdb8ea90b04683adb25c8ccd71b6eaedc44b51e2
Component: engine
 2016-12-07 07:41:55 -08:00
Brian Goff
1a51a9823b Merge pull request #29195 from vdemeester/integration-test-shell-dont-run-if-compilation-failure 
Make sure we don't run integration cli test if compilation fails
Upstream-commit: 8b7d0764256f8476e4adeba2fb0b8a2d5558f25a
Component: engine
 2016-12-07 10:35:30 -05:00
Brian Goff
0856573894 Merge pull request #29061 from allencloud/forbid-leave-when-swarm-locked 
not export errors and forbid leave without --force when unlocked
Upstream-commit: 145fa7781777080b29b2eb9597f0789b6638a91a
Component: engine
 2016-12-07 10:30:28 -05:00
Vincent Demeester
f4ce4909fe Merge pull request #29201 from lixiaobing10051267/masterVar4 
modify URLs for bind docker in docs/api
Upstream-commit: 9b91c7e423062455d7bbb9e33d7e7812dd64ab22
Component: engine
 2016-12-07 16:30:02 +01:00
Vincent Demeester
c9d884efda Merge pull request #29202 from sdurrheimer/zsh-completion-network-attachable 
Add zsh completion for 'docker network create --attachable'
Upstream-commit: d23bb3d0831fa200d45510e9f85b0086b2533553
Component: engine
 2016-12-07 09:18:22 +01:00
Steve Durrheimer
a7b2b7037a Add zsh completion for 'docker network create --attachable' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: bce11a29f822e18ef2bac28f147b5506f785e4cc
Component: engine
 2016-12-07 08:09:42 +01:00
lixiaobing10051267
e148b77b83 modify URLs for bind docker in docs/api 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 9c76fb253ecc53cc54d196a4460d8e1d91c1683d
Component: engine
 2016-12-07 15:06:16 +08:00
Lei Jitang
b1cf7fa923 fix #29199, reset container if container start failed 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: e806821b53f9ca1f1a3d933e7bbfe04a5566a3bf
Component: engine
 2016-12-07 01:37:08 -05:00
allencloud
ed60722124 not export errors and forbid leave when unlocked 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7bdd1a4f9c06ab4af8e652b7483104456e72c442
Component: engine
 2016-12-07 13:25:34 +08:00
erxian
afe61e5090 refine api swagger.yaml towards image create status code 
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 15be050fb307d0da1521767a6f53d9b95429396b
Component: engine
 2016-12-07 10:27:40 +08:00
John Howard
af8b72cda0 Merge pull request #29186 from yongtang/29185-docker-inspect-unknown-object 
Fix `docker inspect <unkown object>` issue on Windows
Upstream-commit: 9249b29348babc571a8c1c25642eb5e792119496
Component: engine
 2016-12-06 18:23:08 -08:00
Aaron Lehmann
7eef41ce9c registry: Remove reference.go 
This removes some very old vestigial code that really should have been
removed during the content addressability transition. It implements
something called "reference" but it behaves differently from the actual
reference package. This was only used by client-side content trust code,
and is relatively easy to extricate.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d91ed88365317cd86555e2f54bffa30ec6590dfe
Component: engine
 2016-12-06 15:53:21 -08:00
Vincent Demeester
ea74b6e388 Make sure we don't run integration cli test if compilation fails 
Otherwise, while using test-integration-shell, it runs the tests using
the previously compiled test binary.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: aefbc034445df17c98f1247b100e2b6a2ed22e84
Component: engine
 2016-12-06 23:37:08 +01:00
Anusha Ragunathan
3889503c60 Make v2/Plugin accesses safe. 
v2/Plugin struct had fields that were
- purely used by the manager.
- unsafely exposed without proper locking.
This change fixes this, by moving relevant fields to the manager as well
as making remaining fields as private and providing proper accessors for
them.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: b35490a8ba2ad70a585c1ba8109b6d87aece8daa
Component: engine
 2016-12-06 13:23:41 -08:00
Yong Tang
37fb30ac29 Fix docker inspect <unkown object> issue on Windows 
This fix tries to address the issue raised on 29185 where
`docker inspect <unknown object>` on Windows will return:
```
Error response from daemon: plugins are not supported on this platform
```

The reason was that in case `--type` is not specified, `docker inspect`
will iterate through different types `container`, `image`, `network`,
`plugin` etc. The `plugin` object is the last type to check.

However, as `plugin` is not supported on Windows yet, the error message
is not very informative for `plugins are not supported on this platform`.

This fix tries to fix the issue by return a `not found` error on unsupported
platforms as well.

An integration test has been added to cover the changes for Windows/Linux.

This fix fixes 29185.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 88fcdb0a825da040ef2b1f9c191af480f0f2cc90
Component: engine
 2016-12-06 12:05:59 -08:00
Evan Hazlett
425efc088a add headers when using exec 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

ensure headers are properly sanitized

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: f86db80b5ff3250a98482b4dc9ff69effbbf2390
Component: engine
 2016-12-06 14:27:34 -05:00
Tõnis Tiigi
d262373ee7 Merge pull request #28907 from tonistiigi/cluster-refactor 
Switch cluster locking strategy
Upstream-commit: eefbf1ddd3ee4e6b6e6dc7e938e77a96ceb40163
Component: engine
 2016-12-06 10:02:23 -08:00
Sebastiaan van Stijn
00a3f09456 Merge pull request #29182 from albers/completion-network-create--attachable 
Add bash completion for `docker network create --attachable`
Upstream-commit: 9ec471049d4a435a489fa27767faebadb0f66e3c
Component: engine
 2016-12-06 18:52:55 +01:00
Harald Albers
281fa9ea35 Add bash completion for docker network create --attachable 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8d2e789bbc59efa75d242457dba4b8651a1f9ace
Component: engine
 2016-12-06 08:44:02 -08:00
Brian Goff
fad60545c0 Merge pull request #29081 from andrewhsu/fix-rhel73 
add selinux policy for centos-7
Upstream-commit: b7ab3276c2f7f875e041ed4d1a3a7975f1496e17
Component: engine
 2016-12-06 11:00:45 -05:00
Brian Goff
78547424d3 Merge pull request #28823 from AkihiroSuda/ensure-dev-pts-readonly 
add a test for ensuring the behavior of read-only /dev/shm
Upstream-commit: 11702c66cfce350ff710d5170921a83b9748d4bf
Component: engine
 2016-12-06 08:39:43 -05:00
Antonio Murdaca
4ecd5ea8d2 Merge pull request #29153 from aaronlehmann/volume-refs-map 
volume: Use a map of maps for VolumeStore.refs
Upstream-commit: fa451847136ae44775ade4738c1ec372e2e4ed98
Component: engine
 2016-12-06 14:35:18 +01:00
Luiz Svoboda
a8eab9725a Add variable DOCKER_BUILD_ARGS to build-deb script 
Some containers were being built (`docker build`) without
the DOCKER_BUILD_ARGS variable, which was causing some
issues because of the lack of network proxy configuration.

Fixes #29132

Signed-off-by: Luiz Svoboda <luizek@gmail.com>
Upstream-commit: 63aaf5e316d7b51db9be94bcb16dab07fdf1fdb4
Component: engine
 2016-12-06 10:17:41 -02:00
Sebastiaan van Stijn
8290729448 Merge pull request #29145 from Microsoft/jjh/make 
Windows: make.ps1 Throw exception on failure
Upstream-commit: 080d7a554322076c4347b3d3f203289eb949cc74
Component: engine
 2016-12-06 12:10:56 +01:00
Sebastiaan van Stijn
3e9857033b Merge pull request #29149 from Microsoft/jjh/dockerfileclarification 
Windows: Dockerfile 2GB clarification Hyper-V
Upstream-commit: 96a2d9e7d2655a8374c2bdf326cd4a7224ce34bf
Component: engine
 2016-12-06 12:10:03 +01:00
Sebastiaan van Stijn
767d2b0a2a Merge pull request #29166 from allencloud/add-403-for-network-create-endpoint 
add 403 for endpoint network create
Upstream-commit: f687eb576ff508872213b5639c3bc279db5e6852
Component: engine
 2016-12-06 11:47:28 +01:00
Vincent Demeester
00e81acaa1 Merge pull request #29073 from adshmh/28756-print-checkpoint-name-in-checkpoint-create-command 
Print checkpoint id when creating a checkpoint
Upstream-commit: 7f9ba93914a5b9fff7c21cc5cb19de90a9190f35
Component: engine
 2016-12-06 11:06:29 +01:00
Vincent Demeester
9603ca0d08 Merge pull request #28896 from yongtang/28884-secret-name-mask-ID 
Fix issue where secret ID is masked by name
Upstream-commit: 57d77cc205768624c36b4bd7fb98d9924925087e
Component: engine
 2016-12-06 11:05:30 +01:00
Vincent Demeester
92a14fe836 Merge pull request #28535 from yongtang/28497-prune-until 
Convert DanglingOnly to Filters for `docker image prune`
Upstream-commit: 745795ef2e0089c5001e5a2fc7ba8c1ab0234857
Component: engine
 2016-12-06 11:03:45 +01:00
Vincent Demeester
050e2993f5 Merge pull request #28974 from AkihiroSuda/test-service-logs 
improve TestServiceLogs for the goroutine issue #28915
Upstream-commit: 08f0100d5025e32d1392fab3493d5c0436ccdd2c
Component: engine
 2016-12-06 10:58:57 +01:00
Vincent Demeester
8be5282fae Merge pull request #29159 from Microsoft/jjh/bumpgit 
Windows: Bump to latest version of git
Upstream-commit: 8326dcd2af04338cf6e56285f42bf8530ccb1274
Component: engine
 2016-12-06 10:30:33 +01:00
Vincent Demeester
c6dacdbe65 Merge pull request #29096 from cyli/fix-swarmjoinpromote-test 
Fix DockerSwarmSuite.TestSwarmJoinPromoteLocked flakiness
Upstream-commit: 67131bde6d6e5511ce76b0e1dafdbe7293eaa1ab
Component: engine
 2016-12-06 10:19:36 +01:00
Sebastiaan van Stijn
cb41d4ee32 Merge pull request #29162 from friism/patch-8 
Windows: make.ps1 - remove bonus whitespace
Upstream-commit: b4618baf68d6db22313a30a985501c61c7dc0b1e
Component: engine
 2016-12-06 10:18:42 +01:00
Akihiro Suda
7eb856b2dd Merge pull request #28939 from duglin/HideDupWarnings 
Only show global warnings once
Upstream-commit: e8a2c7196a2715c318bbfb2b57076fa1922a245f
Component: engine
 2016-12-06 16:12:34 +09:00
allencloud
13d5eb7768 add 403 for endpoint network create 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0d21e24b9fb90ea804ba37af303de7547743ba2b
Component: engine
 2016-12-06 14:36:50 +08:00
Akihiro Suda
67570c96fa Merge pull request #29136 from cpuguy83/pkgcache_use_volume 
Use named volumes for docker pkg cache
Upstream-commit: 268991a9f52557a922d41c98de6d72c9d084a9d6
Component: engine
 2016-12-06 14:26:10 +09:00
Michael Friis
f9e126f19d remove bonus whitespace 
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 8d47858f96c7ef03a9d3543e0994119390acb1bb
Component: engine
 2016-12-05 20:21:25 -08:00
Akihiro Suda
cc8d5c0801 improve TestServiceLogs for the goroutine issue #28915 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: f8a93d0c9d157dddc4e4d4d9c43a6fe7c7c0c242
Component: engine
 2016-12-06 03:44:49 +00:00