1
0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Commit Graph

21879 Commits

Author SHA1 Message Date
Tibor Vass
c4243d21fc Merge pull request #21619 from mlaventure/use-debian-llvm-repo
Update the llvm repo to use the debian jessie url
Upstream-commit: c1706d722fdb0d5017ee0251cfaa4c352a26c986
Component: engine
2016-03-29 12:09:10 -04:00
Arnaud Porterie
922dd0a9e8 Merge pull request #21586 from calavera/remove_runconfig_from_routes
Remove runconfig package dependency from the API.
Upstream-commit: 1da40fb4badd116a7591dd2c19009146770c9a89
Component: engine
2016-03-29 08:40:49 -07:00
Kenfe-Mickael Laventure
1a2b48337a Update the llvm repo to use the debian jessie url
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 73672c5bd8ad170224957734bd1eaf20b11680ba
Component: engine
2016-03-29 08:39:16 -07:00
Alexander Morozov
ff692d79a4 Merge pull request #21599 from tonistiigi/separate-daemon-exec-root
Use separate exec-root for test daemons
Upstream-commit: d33480474f33523743ae49c1b96737fbfbeb1a6f
Component: engine
2016-03-29 07:52:18 -07:00
Vincent Demeester
d37b8026f1 Merge pull request #21585 from tophj-ibm/ppc64le-bump-go1.6
ppc64le: bump golang back to 1.6
Upstream-commit: 78076d5cf9413476a8d4e27822b96fef7a55e055
Component: engine
2016-03-29 09:58:20 +02:00
Vincent Demeester
cd7e028207 Merge pull request #21602 from aaronlehmann/login-log-message
Correct login debug log message
Upstream-commit: 4aa36da9ad35ff93db6420c3ffcc87c5ed64a7a5
Component: engine
2016-03-29 09:56:08 +02:00
Vincent Demeester
9f98018db6 Merge pull request #21529 from LK4D4/test_exit_early
integration-cli: exit early if daemon immedately crashed
Upstream-commit: 6eb38359954269103f2a3094283c4cb0a1cb63f9
Component: engine
2016-03-29 09:34:17 +02:00
Vincent Demeester
5f7e4a225f Merge pull request #21597 from aaronlehmann/mention-docker-login
Mention "docker login" in push/pull documentation
Upstream-commit: 08db95161a1dc7c5bfe570652d4eb859025a62cb
Component: engine
2016-03-29 09:27:53 +02:00
Vincent Demeester
2a9ea71f8e Merge pull request #21576 from albers/docs-daemon--containerd
docs for `docker daemon --containerd`
Upstream-commit: b9d59e86d35bd2cfba0c77c323b14b05a238eae6
Component: engine
2016-03-29 09:25:16 +02:00
Vincent Demeester
2d4bee9107 Merge pull request #21589 from tkopczynski/20784-builder-tests
Builder/dockerignore tests
Upstream-commit: 9021b048f5c2c92baddcefcfeedc731a32b5cca7
Component: engine
2016-03-29 09:20:15 +02:00
Vincent Demeester
04b0094596 Merge pull request #21561 from HackToday/addman
Add man change for volume filter
Upstream-commit: 53f3248d90713b5d3209c6b931d99f58592691eb
Component: engine
2016-03-29 09:18:16 +02:00
Vincent Demeester
57e1cc77d5 Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli
CLI flag for docker create(run) to change block device size.
Upstream-commit: e6aa40a017e0c11186fb9053b9e71e34b93ebe1c
Component: engine
2016-03-29 08:52:54 +02:00
Sebastiaan van Stijn
98d00ddae5 Merge pull request #21596 from trumpcard/master
Fix a link in the volumes doc to the deprecated doc.
Upstream-commit: f95058aa0fee0b816aa84e51fd886528d2eb0afb
Component: engine
2016-03-28 19:25:10 -07:00
Sebastiaan van Stijn
ce89a82639 Merge pull request #21541 from yongtang/20909-engine-api
Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
Upstream-commit: eeaf14395e05b331b82d429d161f5d76f7b1837d
Component: engine
2016-03-28 19:01:15 -07:00
Sebastiaan van Stijn
46aef12c44 Merge pull request #21587 from Microsoft/jjh/bridgeconfig
Windows: bridgeConfig rework
Upstream-commit: 6114072ffc78adda9888b31c70b95e73a8ea3c2e
Component: engine
2016-03-28 18:45:41 -07:00
Aaron Lehmann
300a77843c Correct login debug log message
I noticed the following message in a daemon log:

```
attempting v2 login to registry endpoint {%!s(bool=false) https://registry:5000 v2 %!s(bool=false) %!s(bool=true) %!s(*tls.Config=&{<nil> <nil> [] map[] <nil> 0xc82075c030 []  0 <nil> false [49196 49200 49195 49199 49162 49161 49172 49171 53 47] true false [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] <nil> 769 0 [] {{0 0} 0} {{0 0} 0 0 0 0} []})}
```

loginV2 tries to log an APIEndpoint as a string, but this struct does
not have a String method. Log the actual URL that will be used as the
endpoint, instead.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e42f85080b8254ee025f30cf7860641836df649f
Component: engine
2016-03-28 18:22:24 -07:00
Tonis Tiigi
40995de161 Use separate exec-root for test daemons
Fixes #21545

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0d9b94c4c5d6b4f03a7a86e731e4110e9f27a51e
Component: engine
2016-03-28 17:38:14 -07:00
Aaron Lehmann
4afee18d2e Mention "docker login" in push/pull documentation
It was suggested to me that documentation for "docker pull" and "docker
push" should reference "docker login", to make clearer how to specify
credentials for a push or pull operation. Add a note to the manual pages
and reference documentation explaining how registry credentials are
managed.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: fb5ea0c0efec238aeeff7c5c3742a0e4eccff2c7
Component: engine
2016-03-28 17:22:41 -07:00
Michael Crosby
93a9ef306c Merge pull request #21552 from tonistiigi/aufs-mount-locks
Protect aufs mounts with locks
Upstream-commit: 051c5ddadc17ffb8a0f9923df0f0b2206ae0eba9
Component: engine
2016-03-28 17:00:43 -07:00
Brian Trump
532443b6b8 Fix a link in the volumes doc to the deprecated doc.
Signed-off-by: Brian Trump <btrump@opselite.org>
Upstream-commit: 02f951b67a889f9bc4fefc602e58efa194d767b7
Component: engine
2016-03-28 16:55:24 -07:00
Sebastiaan van Stijn
c4d2d001a2 Merge pull request #21582 from kamigerami/fixes-21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md
fixes-#21581-no--subnetwork-option-as-specified-in-docs
Upstream-commit: 1e1da2a29bf79fadc8a970f4acaa4333723e4880
Component: engine
2016-03-28 16:25:52 -07:00
Tõnis Tiigi
7ad3abac63 Merge pull request #21251 from cyphar/refactor-copyonbuild
pkg: archive: don't fail Untar if xattrs are not supported
Upstream-commit: 553edd1d19193a1413515fdf3807a6136c4fc0a6
Component: engine
2016-03-28 16:15:18 -07:00
David Calavera
7aec9a02df Merge pull request #21577 from albers/completion-dm.min_free_space
bash completion for `dm.min_free_space`
Upstream-commit: d7382c1fa3c21012fd40a13f1265bcec3e3cf2ab
Component: engine
2016-03-28 15:42:21 -07:00
Arnaud Porterie
06f05f7324 Merge pull request #21590 from tonistiigi/apt-mirror
Allow specifying apt mirror in dockerfile
Upstream-commit: 121b78c27d8237954d072d4e343070b2a3ded5e5
Component: engine
2016-03-28 15:08:40 -07:00
Tonis Tiigi
96f809cfc7 Allow specifying apt mirror in dockerfile
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8ec8564691dc1ebf757c93fe51f6b64a8fcb49af
Component: engine
2016-03-28 13:47:28 -07:00
Tomasz Kopczynski
5a3dd03f44 Dockerignore tests
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 555d8cb293705bd2ad2d8cac7881616756eca767
Component: engine
2016-03-28 22:31:35 +02:00
David Calavera
56103ffaad Remove runconfig package dependency from image and container routers.
Use an interface to specify the behavior of a configuration decoder.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f0d26e1665f7552972db5b041554cc7b45bc3060
Component: engine
2016-03-28 16:23:51 -04:00
David Calavera
91e6a2df59 Remove runconfig dependency from network routes.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3ca29823d42ab1e2b1ea76981ccc9aa11e858cb2
Component: engine
2016-03-28 16:23:50 -04:00
David Calavera
1660794bad Merge pull request #21523 from LK4D4/cancellable_routes
Embed context.Context to routes with usage of CloseNotify
Upstream-commit: be390c30cdde978ea1a5417875876e4f3ae52655
Component: engine
2016-03-28 12:44:07 -07:00
John Howard
701bd59680 Windows: bridgeConfig rework
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ff3525c80f9118e2320e480dde75887c50d6ac0a
Component: engine
2016-03-28 12:24:01 -07:00
Christopher Jones
3ebcf90785 ppc64le: bump golang back to 1.6
Despite the current issue with unix sockets and golang, I'm bumping this back up to 1.6.
Go <1.6 has major compatibility issues on ppc64* including not supporting dynamic binding,
so we would have to go back to gccgo, which is worse in a lot of other categories. Ultimately for us,
the amount of people affected by this issue isn't worth switching compilers.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 3e3ac8abeaf892bbb985e7b70b37f6eee1731338
Component: engine
2016-03-28 15:10:42 -04:00
David Calavera
e7a45df591 Merge pull request #21553 from tonistiigi/test-repeat
Add support for repeating integration tests
Upstream-commit: cf91a1be45fc4f1d4e3338610f921d665d406b04
Component: engine
2016-03-28 11:39:22 -07:00
David Calavera
4d49388b9b Merge pull request #21566 from allencloud/upper-case-docker-info-display
upper case docker info details
Upstream-commit: dd7691423f685bc4d724224913556c7e2cf4bc56
Component: engine
2016-03-28 11:37:23 -07:00
David Calavera
6d41979085 Merge pull request #21556 from twistlock/basic_authn_client_cert
Extend Docker authorization with TLS user information
Upstream-commit: dd757deae06c55d7c2c1dcf5177dcfe7de386a61
Component: engine
2016-03-28 11:36:02 -07:00
David Calavera
a57d5675f0 Merge pull request #21579 from albers/completion-run--userns
bash completion for `docker {run,create} --userns`
Upstream-commit: d48b1c6de5440cb571737e914d50f434d860567a
Component: engine
2016-03-28 11:31:55 -07:00
David Calavera
13c92dc94b Merge pull request #21580 from sdurrheimer/zsh-completion-create-run-userns
Add zsh completion for 'docker {create,run} --userns'
Upstream-commit: 22ca91b08469be0143e8504e0599924380af28bd
Component: engine
2016-03-28 11:31:39 -07:00
David Calavera
1f1392075e Merge pull request #21584 from albers/completion-fix--security-opt
fix bash completion for `docker run --security-opt`
Upstream-commit: 20ab6700902ff516d387209eeec9057131390a0a
Component: engine
2016-03-28 11:29:31 -07:00
Harald Albers
b6a76f6ed0 fix bash completion for docker run --security-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 020998e24cc9bdf16204f1db18cf4886897c1541
Component: engine
2016-03-28 08:07:28 -07:00
kamjar gerami
3002758658 fixes-#21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md: fixed typo in docs
Signed-off-by: kamjar gerami <kami.gerami@gmail.com>
Upstream-commit: a4d4243b9105d03b1e519729e8e8fd4b16084760
Component: engine
2016-03-28 17:02:27 +02:00
Shishir Mahajan
9ab7e4327f CLI flag for docker create(run) to change block device size.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: b16decfccfdb0749c490be9272cb7b4789be87b4
Component: engine
2016-03-28 10:05:18 -04:00
Harald Albers
c8b6e46487 bash completion for docker {run,create} --userns
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 62475684b9cb09ba5cc3f2dd3b3ad88031b391ba
Component: engine
2016-03-28 06:47:33 -07:00
Steve Durrheimer
0f9376bef8 Add zsh completion for 'docker {create,run} --userns'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 39d7ff233bbc2f333cce30124bfd6f52bba1ae2a
Component: engine
2016-03-28 15:39:27 +02:00
Yong Tang
857efac1d1 Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
This PR updates vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9
in order to support `SecurityOptions` in `Info`.

See #20909, #21172 for details related to `SecurityOptions`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 270562f439684a8fca84617ab7ceb494b7afd301
Component: engine
2016-03-28 13:38:15 +00:00
Dmitri Logvinenko
e155de707d Fix misspellings
Signed-off-by: Dmitri Logvinenko <dmitri.logvinenko@gmail.com>
Upstream-commit: 6dede879fd8e0c5f599631d125753d360ead3bc0
Component: engine
2016-03-28 16:21:02 +03:00
Steve Durrheimer
e174dcb4d2 Add zsh completion for 'docker daemon --containerd'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 63b29eda68683bad2e375fee97b4d106a5ca5a77
Component: engine
2016-03-28 14:40:56 +02:00
Harald Albers
9332b48560 docs for docker daemon --containerd
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 75f0015c50fef03067c5d54097fb6eb8cb62200b
Component: engine
2016-03-28 05:40:27 -07:00
Harald Albers
40b838beee fix wrong option name in dm.min_free_space examples
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2623b3496ead7c275d2e54bdfcdab0eab528be51
Component: engine
2016-03-28 05:20:06 -07:00
Harald Albers
5e826c652d bash completion for storage option dm.min_free_space
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: eae4e84c6618e2633347477d788eb351529b0361
Component: engine
2016-03-28 05:15:56 -07:00
Harald Albers
73e3eff64f bash completion for docker daemon --containerd
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: aeaba46c2c411523fc03ce5fcdf51f50e14b80ce
Component: engine
2016-03-28 04:30:02 -07:00
allencloud
64bbcab7a5 upper case docker info details
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 276a20dd426524c254e8b2a4cc9047bcc62fd321
Component: engine
2016-03-28 18:47:04 +08:00