docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
25,607 Commits 12 Branches 297 Tags
1a5af00ee4981ce73a2e76dab627455d1902cdbe
Commit Graph

25607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff
1a5af00ee4 Merge pull request #24119 from albers/completion-swarm-mode 
Fix & improve bash completion for swarm mode commands
Upstream-commit: 2664f374527d160b14f55b5547fef14f0e813eec
Component: engine
 2016-07-08 15:34:51 -04:00
Sebastiaan van Stijn
1f5dadc0e0 Merge pull request #24389 from Microsoft/jjh/silentsecurity 
Windows: No security warning on quiet
Upstream-commit: db435560b38e4489ff3b0a8031d7b5110961fd32
Component: engine
 2016-07-08 11:06:33 -07:00
Sebastiaan van Stijn
e1639e03c6 Merge pull request #24358 from AkihiroSuda/fixdockertop 
Validate arguments for `ps` in `docker top`
Upstream-commit: 152f5a5cedb062c26745cab81159b6bb2e05c0b1
Component: engine
 2016-07-08 10:57:13 -07:00
Tõnis Tiigi
eaf2bbac5f Merge pull request #24435 from cpuguy83/24350_cleanup_on_no_running_containers 
Fix daemon not cleaned up w/ live restore enabled
Upstream-commit: a34534fe95f0b7378837a5d5993b1058d41a635e
Component: engine
 2016-07-08 10:23:14 -07:00
Sebastiaan van Stijn
4e31188a93 Merge pull request #24431 from mavenugo/revert 
Check for swarm-mode network conflict during create network
Upstream-commit: e10c11e4a1ac39a408f7503b594207e481387c87
Component: engine
 2016-07-08 09:41:34 -07:00
Alexander Morozov
488c448cbd Merge pull request #24449 from justincormack/proxy-rpmfiles 
Add missing docker-proxy into managed files in rpm spec
Upstream-commit: 590a5ca18c9fd9682a143b24b3d636c63555573d
Component: engine
 2016-07-08 09:12:27 -07:00
Alexander Morozov
3d5be41442 Merge pull request #24450 from runcom/fix-systemd-defaultRuntime 
daemon: ensure we set default options to stock runtime
Upstream-commit: 9d10221a1c433799fa07672ef9fcdebb8d99698f
Component: engine
 2016-07-08 08:52:18 -07:00
Antonio Murdaca
bff94672e9 daemon: ensure we set default options to stock runtime 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 59162641cc20640afb785540b5f47178835de656
Component: engine
 2016-07-08 15:58:06 +02:00
Vincent Demeester
bab1299e0a Merge pull request #24448 from justincormack/proxy-docs 
Update binary install docs with new contents of tgz
Upstream-commit: dd1a27ce2af1b2e7db5e11a1b82a1248cc23dea3
Component: engine
 2016-07-08 15:19:09 +02:00
Justin Cormack
7ad6d3bf27 Add missing docker-proxy into managed files in rpm spec 
This was missed in #23312 even though the other parts of
this were fixed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 47ace5cd989103f7d646282fce66434b5a3c13f6
Component: engine
 2016-07-08 14:15:57 +01:00
Justin Cormack
5bd4fa63c5 Update binary install docs with new contents of tgz 
This is now up to date with contents of 1.12 tgz

Also change usage to `dockerd` not `docker daemon`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 7102e09f29822e4bb0e375738c5194ded8b716ca
Component: engine
 2016-07-08 13:33:41 +01:00
Antonio Murdaca
6bce8d3d1e Merge pull request #24412 from justincormack/aarch64-ltdl 
Add ltdl dependencies for aarch64
Upstream-commit: 012f9f4cb8c62a624728bcadb16d06c79f5d7c0f
Component: engine
 2016-07-08 12:26:05 +02:00
Akihiro Suda
6e2ed85ac6 Validate arguments for ps in docker top 
Fix #24357

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 253933220965574422aa6679255359d8bd15d435
Component: engine
 2016-07-08 05:58:11 +00:00
Sebastiaan van Stijn
4aeaa2fa8d Merge pull request #24432 from sfsmithcha/doc_service_constraint 
add constraint to service create ref
Upstream-commit: 63186c06cb7ea5c437d6a3faa1c3f190134c7be5
Component: engine
 2016-07-07 21:06:50 -07:00
Brian Goff
fde455a0e2 Fix daemon not cleaned up w/ live restore enabled 
This patch makes sure daemon resources are cleaned up on shutdown if
there are no running containers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2d5dc94b9b547a9ba73f7b613e358b03fdfb2b84
Component: engine
 2016-07-07 22:25:41 -04:00
Tibor Vass
6594994c99 Merge pull request #24426 from thaJeztah/add-iptables-to-multi-daemon-docs 
add iptables=false to docs for multiple daemons
Upstream-commit: bd37b8305275946c06793278425f9bb83d0bafa9
Component: engine
 2016-07-07 18:50:45 -07:00
Charles Smith
7cb7f0210f add constraint to service create ref 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 093817031acd2b8dc17cba5c3c994b2d6d19dc0e
Component: engine
 2016-07-07 18:25:37 -07:00
Tibor Vass
e4b8c6fd9c Merge pull request #23312 from justincormack/proxy 
Make the docker proxy a standalone binary not a re-exec
Upstream-commit: 07dd69df8d6c5f4da0059d49e128fef9277fcb5d
Component: engine
 2016-07-07 17:14:40 -07:00
Madhu Venugopal
5133d86660 fixes #23983 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6a4b21bd863f955d05e5df1e54be4dfcf6889870
Component: engine
 2016-07-07 16:23:50 -07:00
Madhu Venugopal
9280648ffe Revert "Fixed a few network UI issues in swarm-mode" 
This reverts commit 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 4623276886033aedb4932c3996c7f61e7fc35861
Component: engine
 2016-07-07 16:23:42 -07:00
John Howard
d206128458 Windows: No security warning on quiet 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a9b3c1d7207e8c4b46b6f7efb3bf5bc3b5160c83
Component: engine
 2016-07-07 16:00:08 -07:00
Tibor Vass
b02186b3ad Merge pull request #24156 from Microsoft/jjh/clearbasefs 
Windows: Clear volume path for Hyper-V containers
Upstream-commit: efcf24f0c41412c196390d7208f908d6fc7b9ed6
Component: engine
 2016-07-07 15:35:14 -07:00
Sebastiaan van Stijn
1af13ec6b5 add iptables=false to docs for multiple daemons 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1255e53e2890149df3c919af7aac88237069e1bb
Component: engine
 2016-07-07 14:54:44 -07:00
Sebastiaan van Stijn
a83cb2f41d Merge pull request #24291 from vdemeester/docs-cli-reference-updates 
Updates on cli reference documentation
Upstream-commit: b98ba9a1d66d9b82eec510fb60a1ff7d7f2e7b0f
Component: engine
 2016-07-07 14:28:54 -07:00
Justin Cormack
d93f3c954e Fix test case for docker_api_swarm_test.go 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 6dfba780cc490ef7579e95169b5c71617f8e5a47
Component: engine
 2016-07-07 21:01:55 +01:00
Justin Cormack
2ccfe96ba1 Update swarmkit vendoring 
Needed for libnetwork vendoring

Update Secret API name change correspondingly

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: d428a7a425f071ee9e5707c7319d3197540adc19
Component: engine
 2016-07-07 21:01:54 +01:00
Justin Cormack
247801dadf Update libnetwork vendoring 
Update now that the changes in https://github.com/docker/libnetwork/pull/1230
have been merged

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3ae0c664507e0d8da5e3151f28b8d00316569e47
Component: engine
 2016-07-07 21:01:41 +01:00
Vincent Demeester
d634daae27 Updates on cli reference documentation 
- Update ps with `--last` flag
- Update commands with current output
- Make sure hugo does not detect the wrong language
- Update usage for `tag` command to be more coherent with the other ones

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f4cfc6b9830ed236eb588d6a4dddca7455145e70
Component: engine
 2016-07-07 20:43:18 +02:00
Tõnis Tiigi
a5fef9cf19 Merge pull request #24349 from aaronlehmann/swarm-secrets-by-default 
Generate a swarm joining secret if none is specified
Upstream-commit: db67db98d837517123abf7f3efbb04d0bec3708b
Component: engine
 2016-07-07 11:43:08 -07:00
Sebastiaan van Stijn
f7a6ca3323 Merge pull request #22868 from Microsoft/jjh/dockerfilecmd 
Windows: CMD not honouring arg escaping
Upstream-commit: 6167a9ab166ce1e6fd0ffa653b9476d33983f15b
Component: engine
 2016-07-07 09:21:26 -07:00
Sebastiaan van Stijn
ca0378ea39 Merge pull request #24369 from vdemeester/24356-on-failure-inconsistency 
Use "on-failure" for both containers and services
Upstream-commit: ace1f176fec38232b78114b2feb8609590481221
Component: engine
 2016-07-07 08:22:59 -07:00
Justin Cormack
a4ffd2d4e9 Add ltdl dependencies for aarch64 
Fixes `make test` and fix #24380 on aarch64

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: d37a7394acd7842f588ef423fb076b05fccd1da2
Component: engine
 2016-07-07 13:02:19 +01:00
Justin Cormack
e758a53186 Make the docker proxy a standalone binary not a re-exec 
This reduces memory usage with a lot of docker proxy processes.
On Docker for Mac we are currently carrying a patch to replace
the binary as we modify it to forward ports to the Mac rather
than the Linux VM, this allows us to simply replace this binary
in our packaging with one that has a compatible interface. This
patch does not provide an easy way to substitute a binary as
the interface is complex and there are few use cases, but where
needed this can be done.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 0682468431867e3382a759402eb92df5877e310b
Component: engine
 2016-07-07 12:53:39 +01:00
Vincent Demeester
f5a13a7cbe Use "on-failure" for both containers and services 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
 2016-07-07 11:32:19 +02:00
Vincent Demeester
8322363100 Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6ec4a640de492e2f3c7b8268b5258d76b38b094b
Component: engine
 2016-07-07 11:32:09 +02:00
Vincent Demeester
c60ffac88e Merge pull request #24383 from anusha-ragunathan/not-plugin 
Detect non-plugin content during install and error out.
Upstream-commit: 656c66dd50d5c5b1f4f40eb4f3134e84e5b80fbc
Component: engine
 2016-07-07 11:18:27 +02:00
Vincent Demeester
c201e7c4a2 Merge pull request #24053 from cpuguy83/mounts_default_writable 
Change defaults for mount writable and volume copying
Upstream-commit: 50674ec107a300067ded77912a2e39de88678c2c
Component: engine
 2016-07-07 11:18:14 +02:00
Sebastiaan van Stijn
508c55b4c2 Merge pull request #24330 from avsm/endpoint-cli-typo 
make `docker service --help` text for `--endpoint-mode` more consistent
Upstream-commit: f85a231c5fc4159a5639228f6e13090637dfb6aa
Component: engine
 2016-07-07 00:24:03 -07:00
Sebastiaan van Stijn
f714c7d690 Merge pull request #24401 from yongtang/07052016-node-list-docs-HOSTNAME 
Change NAME to HOSTNAME in docs for `docker node ls`
Upstream-commit: cd53e75c8983a2acb15a4190561bceeaf78964d1
Component: engine
 2016-07-06 22:49:34 -07:00
Yong Tang
3bc3d3b9a0 Change NAME to HOSTNAME in docs for docker node ls 
In #24159, the title field of `docker node ls` has been
changed from NAME to HOSTNAME. However, in the docs the
NAMEs are still used for the output of `docker node ls`.

This fix updates docs so that NAME field is changed to
HOSTNAME for all `docker node ls`.

This fix is related to #24159 and #24090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 668b8a998f5ebbe66c7376c432a5fd87208add73
Component: engine
 2016-07-06 20:23:53 -07:00
Brian Goff
4894793d19 Merge pull request #24361 from coolljt0725/add_ip_ping 
Install iproute2 and iputils-ping in Dockerfile.aarch64
Upstream-commit: 28e9d93f5201a8c352e9eb0d63e08660aa8fcf1d
Component: engine
 2016-07-06 22:51:34 -04:00
Brian Goff
7ac01fb32e Use newer default values for mounts CLI 
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`

Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 56f3422468a0b43da7bae7a01762ce4f0a92d9ff
Component: engine
 2016-07-06 22:34:39 -04:00
Anusha Ragunathan
8d49a670d8 Detect non-plugin content during install and error out. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: d32df6d934875052232bbbc49fa473bd283af6e4
Component: engine
 2016-07-06 18:49:39 -07:00
Brian Goff
a70c2240b7 re-vendor swarmkit 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: db271b8833fc0b55998afababdaad60a67e3a982
Component: engine
 2016-07-06 21:14:14 -04:00
Brian Goff
892399249d re-vendor engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 140ec59db6e413de5025fb8686b97bf80b66c519
Component: engine
 2016-07-06 21:14:14 -04:00
Brian Goff
6f5e6c31db Merge pull request #24373 from floatingLomas/zsh-completion-fix 
Remove unmatched bracket from _docker for zsh
Upstream-commit: a04a11f3e51a2c93c924384af6d4fcfa1cd42900
Component: engine
 2016-07-06 16:54:16 -04:00
Aaron Lehmann
08bcf7365f Generate a swarm joining secret if none is specified 
The current behavior of `docker swarm init` is to set up a swarm that
has no secret for joining, and does not require manual acceptance for
workers. Since workers may sometimes receive sensitive data such as pull
credentials, it makes sense to harden the defaults.

This change makes `docker swarm init` generate a random secret if none
is provided, and print it to the terminal. This secret will be needed to
join workers or managers to the swarm. In addition to improving access
control to the cluster, this setup removes an avenue for
denial-of-service attacks, since the secret is necessary to even create
an entry in the node list.

`docker swarm init --secret ""` will set up a swarm without a secret,
matching the old behavior. `docker swarm update --secret ""` removes the
automatically generated secret after `docker swarm init`.

Closes #23785

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 7342e42fcecbc243bcb8723b8422879662452017
Component: engine
 2016-07-06 13:04:50 -07:00
Alexander Morozov
9ff9ce64f9 Merge pull request #24133 from cpuguy83/hacky_swarm_integration_tests 
Implement service integration tests
Upstream-commit: 6f052edcc0c6558ca5b3d547109d9be72fe0176a
Component: engine
 2016-07-06 11:49:27 -07:00
Lei Jitang
69d9702958 Install iproute2 and iputils-ping in Dockerfile.aarch64 
ping and ip command are need in integration-cli test, but
they are missing in ubuntu:wily.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 276e234ca0ec0fa20497b22f9a6d193e999d73cb
Component: engine
 2016-07-06 16:48:51 +00:00
Vincent Demeester
443b041acb Merge pull request #24363 from runcom/fix-cross-push-digests 
vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
Upstream-commit: 6bf357561fbc0fd028503f85c589c849c83d7134
Component: engine
 2016-07-06 18:17:51 +02:00