toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,626 Commits 3 Branches 295 Tags
83cd2e69038056b642b1dc04f8df0ec5f7ea020d
Commit Graph
30626 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin f693277e41 Test and fix external secrets in stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b3427e43edc56824f762e964c955b906fa363a3a
Component: engine
 2017-01-26 11:33:15 -05:00
Daniel Nephin 5ed83fcbc5 Add integration test for stack deploy with secrets. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6ec84ef76df30663d5728f903b314f4486587135
Component: engine
 2017-01-26 11:33:15 -05:00
Daniel Nephin fc26836a78 Implement secret types for compose file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9419e7df2b54b684bef6c787239a2c92fbb4acda
Component: engine
 2017-01-26 11:33:15 -05:00
Daniel Nephin 9fa961acee Add v3.1 schema and support validating multiple version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 65374488f92512cf34667cb71ea6d62985310f65
Component: engine
 2017-01-26 11:33:15 -05:00
Lars-Magnus Skog cab1925d86 update api docs on Placement.Constraints for services 
Signed-off-by: Lars-Magnus Skog <ralphtheninja@riseup.net>
Upstream-commit: 9c98bffc2b92625f113b390442b6dca245cb4be5
Component: engine
 2017-01-26 15:01:21 +01:00
Sebastiaan van Stijn 22f59a404a Merge pull request #30111 from darrenstahlmsft/DependsConDrv 
Windows: Add service dependency ConDrv
Upstream-commit: fe5f49685df0d52127158f7e9a2882b8c4168dab
Component: engine
 2017-01-26 12:49:05 +01:00
Sebastiaan van Stijn 5fdbe54084 Merge pull request #28921 from allencloud/remove-incorrect-url 
update an incorrect url in docs
Upstream-commit: bc18cfa3f37736b0143d0f3f8fe527923c8a966e
Component: engine
 2017-01-26 10:29:12 +01:00
allencloud eebfc64a61 update incorrect url in docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5ae95d6245d30751951418650331def487bf935b
Component: engine
 2017-01-26 12:57:45 +08:00
Harald Albers b0cadb1839 Rename helper function in bash completion for consistency 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 93e43b42be7e600a266c17c64a3d718a0a4737a6
Component: engine
 2017-01-25 15:55:04 -08:00
Harald Albers 19e6c32abb Hide bash completion for docker run|create|build --isolation on non-windows 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fceaae95b5a61954ea40913b45b37b7dd1dd4d8a
Component: engine
 2017-01-25 15:55:04 -08:00
Kenfe-Mickaël Laventure 61a58b02fd Merge pull request #30376 from albers/completion-fix-node-list 
Fix bash completion for completing nodes
Upstream-commit: db657a558ecff8e64490ebef15d744af7ef19d50
Component: engine
 2017-01-25 11:52:13 -08:00
Yong Tang a818254bf8 Fix incorrect Scope in network ls/inspect with duplicate network names 
This fix tries to address the issue raised in 30242 where the `Scope`
field always changed to `swarm` in the ouput of `docker network ls/inspect`
when duplicate networks name exist.

The reason for the issue was that `buildNetworkResource()` use network name
(which may not be unique) to check for the scope.

This fix fixes the issue by always use network ID in `buildNetworkResource()`.

A test has been added. The test fails before the fix and passes after the fix.

This fix fixes 30242.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 05a831a775be5e8d752deaef620e629deb15cb89
Component: engine
 2017-01-25 09:39:55 -08:00
Alexander Morozov 6ce7bda47e Merge pull request #30330 from mlaventure/prune-named-untagged 
Prune named but untagged images if danglingOnly=true
Upstream-commit: a76572b846944456a06c0234fc0529db9df3e193
Component: engine
 2017-01-25 08:38:15 -08:00
Harald Albers 619883aba7 Add windows specific bash completion for docker run|create 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f2ee29ed96a9ba9c13cc1bec8b393565f5da9041
Component: engine
 2017-01-25 10:24:27 +01:00
Aaron Lehmann 0dedd22a73 Merge pull request #30043 from dmcgowan/distribution-reference-update-1 
Distribution reference update
Upstream-commit: e9c0de0de65182915d1cd205f06f5c903c20a29f
Component: engine
 2017-01-24 20:38:20 -08:00
Sebastiaan van Stijn 751c4495a1 Merge pull request #30182 from AkihiroSuda/validate-tmpfs 
validate mount path for tmpfs
Upstream-commit: d4cd4b2164317e93873f2a6a43d75b0658d32d60
Component: engine
 2017-01-25 03:08:17 +01:00
Victor Vieux 3a33131bc7 Merge pull request #30291 from yongtang/30279-ps-format 
Fix failure in `docker ps --format` when `.Label` has args
Upstream-commit: 42d25de1b75a1f5b0d8369889b00b83e212c1d92
Component: engine
 2017-01-24 17:55:52 -08:00
Sebastiaan van Stijn 3920d4e123 Merge pull request #30227 from thaJeztah/fix-ineffectual-assignments 
fix some ineffectual assignments (and minor fixes)
Upstream-commit: 9b2dabbf1845d6730cf9d9b12c63fb4e94e0f886
Component: engine
 2017-01-25 02:49:57 +01:00
Victor Vieux 9d9b9fe93c Merge pull request #30408 from cpuguy83/fix_plugin_wait 
Fix deadlock on v1 plugin with activate error
Upstream-commit: 113e9f07f49e9089df41585aeb355697b4c96120
Component: engine
 2017-01-24 17:29:56 -08:00
Victor Vieux 5ce50d238a Merge pull request #30325 from dnephin/add-internal-to-compose-network 
Add network.internal to Compose schema
Upstream-commit: 4726fd120334ad5452c53a4f031893543da10e1a
Component: engine
 2017-01-24 17:16:08 -08:00
Aaron Lehmann ce4bab4518 Merge pull request #30206 from coolljt0725/fix_save_share_layers 
Follow #28926, fix docker save can't share layers in the tar archive.
Upstream-commit: 3c82a9bc27784654f5356cf16cb9e5df5a0339a6
Component: engine
 2017-01-24 16:28:11 -08:00
Brian Goff 1245f22731 Merge pull request #30269 from sdurrheimer/zsh-completion-service-ps-multi 
Add zsh completion for multiple service for 'docker service ps'
Upstream-commit: f07f54951fcf918423463d57c67d6fe04b82941b
Component: engine
 2017-01-24 16:33:30 -05:00
Kenfe-Mickaël Laventure 86c166c49a Merge pull request #30391 from andrewhsu/check-changelog-date 
validate CHANGELOG.md dates are in descending order
Upstream-commit: 5e74dc11e3507c36aafae9909c1fa0ee4eee4003
Component: engine
 2017-01-24 11:18:21 -08:00
Michael Crosby dbe5a280c8 Merge pull request #30283 from albers/completion-run--init-path 
Add bash completion and docs for `docker run|create --init-path`
Upstream-commit: b13ecbc7b530fa17e4c7a4509c8c7d9e1a6c1e90
Component: engine
 2017-01-24 10:06:44 -08:00
Vincent Demeester 25403b5f1a Merge pull request #30413 from thaJeztah/minor-godocs-fixup 
Minor GoDoc fixup in integration-cli
Upstream-commit: f645ffca04abf2dd6c89ac9057a1eb7d2b0ac338
Component: engine
 2017-01-24 18:08:27 +01:00
Sebastiaan van Stijn f757a1d4b1 Minor GoDoc fixup in integration-cli 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 089e1c1c5b74dd794c4cb6db86240e175000edc0
Component: engine
 2017-01-24 18:03:30 +01:00
Sebastiaan van Stijn 20217e017d do not ignore local build-contexts starting with "github.com" 
Docker special-cases build-contexts starting with `github.com`, and
treats them as remote URLs.

Because of this special treatment, local build contexts in a directory
named "github.com" are ignored by `docker build`.

This patch changes the way the build-context is detected and first
checks if a local path with the given name exists before considering
it to be a remote URL.

Before this change;

    $ mkdir -p github.com/foo/bar && echo -e "FROM scratch\nLABEL iam=local" > github.com/foo/bar/Dockerfile

    $ docker build -t dont-ignore-me github.com/foo/bar
    Username for 'https://github.com':

After this change;

    $ mkdir -p github.com/foo/bar && echo -e "FROM scratch\nLABEL iam=local" > github.com/foo/bar/Dockerfile

    $ docker build -t dont-ignore-me github.com/foo/bar
    Sending build context to Docker daemon 2.048 kB
    Step 1/2 : FROM scratch
     --->
    Step 2/2 : LABEL iam local
     ---> Using cache
     ---> ae2c603fe970
    Successfully built ae2c603fe970

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 37a1a84d913a64cec7bc05d44a7e4c5c3445a8ae
Component: engine
 2017-01-24 17:44:44 +01:00
Brian Goff 4defdd0e1e Fix deadlock on v1 plugin with activate error 
When a plugin has an activation error, it was not being checked in the
`waitActive` loop. This means it will just wait forever for a manifest
to be populated even though it may never come.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f2d384fca6fa08da13fdc01c7991e8e35b081198
Component: engine
 2017-01-24 11:08:13 -05:00
Brian Goff aca0d9b25a Merge pull request #30268 from sdurrheimer/zsh-completion-plugin-install-alias 
Add zsh completion for 'docker plugin install --alias'
Upstream-commit: 34d06190740d555b63cbe814028c207b13b4c2cc
Component: engine
 2017-01-24 10:08:57 -05:00
Brian Goff c26a6ba57a Merge pull request #30399 from albers/completion-swarm-lock 
Add bash completion for `docker swarm unlock|unlock-key`
Upstream-commit: aa180e5f31c78f2216fe664378828baac0954175
Component: engine
 2017-01-24 09:43:07 -05:00
Sebastiaan van Stijn d1e2c73060 Add "src" alias for --secret 
This patch adds a "src" alias for `--secret`
to be consistent with `--mount`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 950658bbb63480de254a166bdeaef1fc8b8fe644
Component: engine
 2017-01-24 15:41:45 +01:00
Brian Goff 648cda85d5 Merge pull request #30398 from albers/completion-swarm-init 
Add missing options to bash completion for `docker swarm init|update`
Upstream-commit: 3bc021cdf371f539295e87d1b22ca9066eda6e87
Component: engine
 2017-01-24 09:41:30 -05:00
Brian Goff 1c12016321 Merge pull request #30373 from albers/completion-fix-service-update 
Fix bash completion for `docker service update`
Upstream-commit: 47da8175be65ac401348a7b03c321914d07a910a
Component: engine
 2017-01-24 09:31:53 -05:00
Brian Goff 465587cda7 Merge pull request #30378 from mlaventure/fix-negative-size 
Ensure proper value is used when computing reclaimable space
Upstream-commit: ee7682ebaedba6025f585c3ab6f0d61513e54e06
Component: engine
 2017-01-24 09:24:53 -05:00
Vincent Demeester bb6348df00 Merge pull request #30394 from aboch/nl 
Vendor vishvananda/netlink @ebdfb74
Upstream-commit: 23341a41a5bada3e6ff151c8f38c5983ff524959
Component: engine
 2017-01-24 15:24:07 +01:00
Vincent Demeester f80b2ebc4e Merge pull request #30248 from albers/completion-capabilities 
Improve bash completion for `docker run --cap-{add,drop}`
Upstream-commit: d417dd7886f420bd369361a6f137364222998488
Component: engine
 2017-01-24 12:10:14 +01:00
Sebastiaan van Stijn 5fc02e465e Merge pull request #30370 from mikesir87/master 
Fixed secret creation usage during service create in docs
Upstream-commit: d1f7798c60ef081f104cbe008a23af4e5e06b20f
Component: engine
 2017-01-24 11:55:09 +01:00
Sebastiaan van Stijn de6f433c3d Merge pull request #30387 from coolljt0725/fix_typo 
typo: fix typo in api documents
Upstream-commit: de1a403810e16aa5d069ea8ca5e407aa447594f9
Component: engine
 2017-01-24 11:46:44 +01:00
Vincent Demeester cac1776108 Merge pull request #30371 from albers/completion-fix-plugin-ls 
Fix bash completion for `docker plugin ls`
Upstream-commit: bb9f7cb280a98c14eb8ec338a1ee1f037c5a1645
Component: engine
 2017-01-24 11:46:13 +01:00
Sebastiaan van Stijn 406aff91c7 fix some ineffectual assignments 
to make goreportcard a bit happier
https://goreportcard.com/report/github.com/docker/docker

also found that `TestCpToErrDstParentNotExists()` was
partially broken, because a `runDockerCp()` was inadvertently
removed in f26a31e80cfcc77daba0872ddb14bf03f4398311

`TestDaemonRestartSaveContainerExitCode()` didn't verify
the actual _Error_ message, so added that to the test,
and updated the test to take into account that the
"experimental" CI enables `--init` on containers.

`TestVolumeCLICreateOptionConflict()` only checked
for an error to occur, but didn't validate if the
error was due to conflicting options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ba0afd70e89562aa3c668c87fb9191ed9edb7260
Component: engine
 2017-01-24 11:16:19 +01:00
Sebastiaan van Stijn c6a1cf9cb8 Merge pull request #29900 from yongtang/29226-network-format-created-at 
Add `.CreatedAt` placeholder for `docker network ls --format`
Upstream-commit: 8820266c17beede7d08b6b077383978f3b7b239f
Component: engine
 2017-01-24 11:01:37 +01:00
Vincent Demeester 4593a8b426 Merge pull request #30385 from aaronlehmann/vendor-swarmkit-grpc-containerd 
Vendor swarmkit, containerd, and related dependencies
Upstream-commit: ac30c4c06c9d797af0025d2454d20383abfaff76
Component: engine
 2017-01-24 11:00:35 +01:00
Vincent Demeester 282bb14467 Merge pull request #29301 from miaoyq/improve-print-info-for-inspect 
Improve the error print of image inspect
Upstream-commit: 0ca4995ca8127f64dd82a4b0d67ef17cf5bdb3db
Component: engine
 2017-01-24 10:56:24 +01:00
Harald Albers fa3a411dc8 Add bash completion for docker swarm unlock|unlock-key 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 07bd5152b3731c108e2dba57b1f51e6609b55ba3
Component: engine
 2017-01-24 10:11:38 +01:00
Harald Albers 4626e249f0 Add missing options to bash completion for docker swarm init|update 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f93da79dc18a989a727978350cca8e941e9daeca
Component: engine
 2017-01-24 10:00:18 +01:00
Harald Albers b26449222d Fix bash completion for completing nodes 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 550947e437fab42a0b661bad5cb2645f61861aa1
Component: engine
 2017-01-24 09:24:34 +01:00
Alessandro Boch 7bd7e5b7ec Vendor netlink @ebdfb74 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ed758b604a593b5d4b9d769461d6c44926d89d91
Component: engine
 2017-01-23 22:47:37 -08:00
Andrew Hsu d3601c28f5 validate changelog dates are in descending order 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 6cca6bf9429e21dc03086a5650e23879cf334a49
Component: engine
 2017-01-23 19:19:35 -08:00
Yanqiang Miao 9cbd4394d2 Improve the error print of image inspect 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: cc9ed0a31b0656c58ad7953f2c54d46258380443
Component: engine
 2017-01-24 11:07:20 +08:00
Lei Jitang 2b0805b53f typo: fix typo in api documents 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2f0d4946823019d2b41a0aac7eaa6b84f8e96e49
Component: engine
 2017-01-23 22:05:44 -05:00