toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,681 Commits 3 Branches 295 Tags
50eae15c8971e80a26beabe62bf2bb3fb8f9d4a3
Commit Graph
12681 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Harald Albers 50eae15c89 Add bash completions for daemon flags, simplify with extglob 
Implementing the deamon flags the traditional way introduced even more
redundancy than usual because the same list of options with flags
had to be added twice.

This can be avoided by using variables in the case statements when
using the extglob shell option.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4bb113f24e1ea12ab7ab9ddfe0508e4f833445e5
Component: engine
 2015-01-21 09:15:30 +01:00
Vincent Batts ea711cace6 Merge pull request #10204 from vbatts/vbatts-dm_info_docs 
devmapper: some explination of `docker info`
Upstream-commit: 06da161aeeb6b458cac2db44db6e3af59d091402
Component: engine
 2015-01-20 09:41:25 -05:00
Tianon Gravi cad4508ee5 Merge pull request #10189 from crosbymichael/update-libcontainer-jan16 
Update to libcontainer eb74393a3d2daeafbef4f5f27c0
Upstream-commit: 2feb2d07b6f98364a585d82af250d32664fd8df3
Component: engine
 2015-01-19 19:33:40 -07:00
Fred Lifton 304cd59f67 Merge pull request #10135 from coolljt0725/update_link_docs 
Update the docs for --link accept container id
Upstream-commit: e6a70a6f819c09f2d33b59adc7378f758349ae6d
Component: engine
 2015-01-19 18:12:50 -08:00
Michael Crosby 73a96089ff Merge pull request #10190 from ashahab-altiscale/9875-lxc-run-links 
LXC needs stdin for container to remain up
Upstream-commit: 7b48488c5641f092e111aa9d5562b368f7e66711
Component: engine
 2015-01-19 17:13:37 -08:00
Michael Crosby f4d05bcf4d Merge pull request #10124 from duglin/Issue10034 
Add the list of possible values for --log-level to help text
Upstream-commit: 1efc940e6f547760e5e8f4648acb120ff19fdc58
Component: engine
 2015-01-19 17:09:18 -08:00
Michael Crosby 829a93bca6 Merge pull request #10061 from brahmaroutu/env_ports_9900 
Env Variables created for each of the ports in addition to env variables...
Upstream-commit: f49fb253753fa472e934935960c5818b443ee697
Component: engine
 2015-01-19 16:56:47 -08:00
Sven Dowideit 6d7d2d6f8c Merge pull request #10170 from thaJeztah/docs-note-environment-vars 
Document that ENV vars are not automatically updated
Upstream-commit: 04d1b93fce4789ad186b4762d94629c11c79ffbe
Component: engine
 2015-01-20 10:04:25 +10:00
Sven Dowideit 9eb9d337ae Merge pull request #10175 from fossilet/patch-1 
Add usage of port mapping for Boot2docker.
Upstream-commit: e08858a80dfd1d947a7cba5031febb6868256195
Component: engine
 2015-01-20 10:03:32 +10:00
James Turnbull bfeba0bea3 Merge pull request #10192 from icecrime/9951_client_proxy_doc 
Add documentation for HTTP proxies
Upstream-commit: 826e0beade7deecdae19322e93a417c6c4872822
Component: engine
 2015-01-19 18:55:25 -05:00
Tibor Vass 1a5071a250 Merge pull request #9826 from icecrime/8318_whitespace_add_copy 
Support whitespace in paths for ADD and COPY
Upstream-commit: 50ff27caa13b4c558b0ddc9f65297b6ef6eb119d
Component: engine
 2015-01-19 18:37:53 -05:00
Vincent Batts 62c5f93e15 devmapper: some explination of docker info 
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Upstream-commit: a09a665d99c84be74ffff68a39dde83ad3c0d34a
Component: engine
 2015-01-19 17:37:08 -05:00
unclejack 63795bba13 Merge pull request #10195 from vbatts/vbatts-dm_udev_sync 
device-mapper udev sync
Upstream-commit: 2d61a62378a2aa9d0b05023e05d2632b596c61c4
Component: engine
 2015-01-20 00:06:29 +02:00
Jessie Frazelle 1d078b8407 Merge pull request #9730 from cpuguy83/9709_fix_volumes_from_missing_container 
Fix volumes-from re-applying on each start
Upstream-commit: 9b4cd01b21a2553c46d5735d827d7b0f570e6cad
Component: engine
 2015-01-19 14:00:53 -08:00
Vincent Batts 8ae343ded1 devmapper: udev sync in docker info 
now:

```
[...]
Storage Driver: devicemapper
 Pool Name: docker-253:2-5767172-pool
 [...]
 Udev Sync Supported: true
[...]
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: d2593546f9a234699cd0034cc6b97c748c10c93e
Component: engine
 2015-01-19 16:28:02 -05:00
Arnaud Porterie 76f28ab081 Merge pull request #10128 from vieux/filters_image 
Server-side restriction of allowed image filters
Upstream-commit: cb9db04fd72cf31b3df802fe19a0cff4cf682438
Component: engine
 2015-01-19 13:24:03 -08:00
Vincent Batts e54a5327c8 devmapper: udev sync on init 
when initializing the devmapper driver, attempt to sync udev and device
mapper. If udev sync is not supported, print a warning. Eventually we'll
likely bail here to avoid unpredictable behavior for users.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 022e1232f84966c4b70a612bc35463ebb58e3137
Component: engine
 2015-01-19 15:57:25 -05:00
Vincent Batts b3b9656da1 devicemapper: dm_udev_get_sync_support 
expose an api to call dm_udev_get_sync_support/dm_udev_set_sync_support

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 9c3380039e15f11fc07741edd4cbc0c7e5c490aa
Component: engine
 2015-01-19 15:15:51 -05:00
Arnaud Porterie 51e443fb29 Add documentation for HTTP proxies 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3a1dbef8232ee4f58cbaf3a2776c27a4d5b04bc4
Component: engine
 2015-01-19 11:23:31 -08:00
Michael Crosby eeb5a0ad4a Merge pull request #9968 from HuKeping/master 
log: Add restart policy name to the inspect information of container
Upstream-commit: 4c38045be1deed08bc1494261fd9a3e2812e67ad
Component: engine
 2015-01-19 11:08:32 -08:00
Jessie Frazelle b098aaedce Merge pull request #9784 from dmcgowan/v2-registry 
Client Support for Docker Registry HTTP API V2
Upstream-commit: 8b95ad230e2ee76450ceb9a80aa8e942a56bb397
Component: engine
 2015-01-19 10:46:38 -08:00
Michael Crosby 3f7b51a04e Merge pull request #10152 from ashahab-altiscale/9875-cap-add-all 
SEND CAPABILITY IDS TO LXC
Upstream-commit: 979a4cdacdea48e401715ad887b43ee0b4bb513a
Component: engine
 2015-01-19 10:46:22 -08:00
Michael Crosby 6a9f109b4d Update to libcontainer eb74393a3d2daeafbef4f5f27c0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6b04d9342c3d76f5979850f93a4afd41afa33227
Component: engine
 2015-01-19 10:37:31 -08:00
James Turnbull a9b7d25bb0 Merge pull request #10138 from ShockwaveNN/patch-1 
fix link to introducion on 'Working with Docker Images' page
Upstream-commit: 27602f2a21732656180397cd4e30b9d246b75a0b
Component: engine
 2015-01-19 10:53:15 -05:00
James Turnbull 681db1e57f Merge pull request #10167 from bgazzera/master 
There was a missing command to re-run the web container.
Upstream-commit: 6286c0711f2abc4a427ba4064b2a5f3d478c4034
Component: engine
 2015-01-19 10:50:08 -05:00
James Turnbull e9a3b78432 Merge pull request #10179 from viirya/trivial_typo 
Fix typo in document
Upstream-commit: 505e0ca80f50996f020e4d877e5efbd57b575d2f
Component: engine
 2015-01-19 10:48:32 -05:00
Liang-Chi Hsieh b9a7e1b9ee Fix typo. 
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com>
Upstream-commit: 1b4a926377524455653019c772355bd71a148045
Component: engine
 2015-01-19 18:02:23 +08:00
Yongzhi Pan adb4e7d83e Add usage of port mapping for Boot2docker. 
Signed-off-by: Yongzhi Pan <panyongzhi@gmail.com>
Upstream-commit: 9dc2d0b8a35724946139f954f9575411b31695ea
Component: engine
 2015-01-19 16:44:13 +08:00
Lei Jitang 9f931ee8fa Update the docs for --link accept container id 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 750373875e25455acb046001cb0582873a90bd73
Component: engine
 2015-01-19 09:57:44 +08:00
Sebastiaan van Stijn 86e0c72c59 Document that ENV vars are not automatically updated 
Unlike the entries in `/etc/hosts`, environment-variables for linked
containers are not automatically updated if the linked container is
restarted.

This adds a note to the documentation in;
https://docs.docker.com/userguide/dockerlinks/#environment-variables
and
https://docs.docker.com/reference/run/#env-environment-variables

To make users aware that this is the case and recommends them to use
the `/etc/hosts` entries in stead.

I added this change because users were expecting environment variables
to be updated automatically as well (https://github.com/docker/docker/issues/10164).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3fb06dc104bb66c3ec7be8a95a33845310083999
Component: engine
 2015-01-19 00:23:57 +01:00
Bruno Gazzera a3290112e7 There was a missing command to re-run the web container. 
Signed-off-by: Bruno Gazzera <bgazzera@paginar.com>
Upstream-commit: 44cde56333fe891e087b8aa5ba914345bbdedbc0
Component: engine
 2015-01-18 12:17:49 -03:00
Abin Shahab c909cbb34a LXC needs stdin for container to remain up 
To run shell(and not exit), lxc needs STDIN. Without STDIN open, it will exit 0.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 79f17dcf7404d0547db68dba8b629c9c1141e47b
Component: engine
 2015-01-18 04:07:20 +00:00
Jessie Frazelle 5a9f9786e1 Merge pull request #10143 from cpuguy83/10129_marshal-indent_dockercfg 
Make .dockercfg with json.MarshallIndent
Upstream-commit: 467b7c8213901ffd788dba1753ac08291c979ec0
Component: engine
 2015-01-17 14:18:45 -08:00
Brian Goff 7319c01771 Fix volumes-from re-applying on each start 
Fixes #9709
In cases where the volumes-from container is removed and the consuming
container is restarted, docker was trying to re-apply volumes from that
now missing container, which is uneccessary since the volumes are
already applied.

Also cleaned up the volumes-from parsing function, which was doing way more than
it should have been.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a738df0354cc615c8d0fa3254621b3db811fe0b9
Component: engine
 2015-01-17 07:14:25 -05:00
Brian Goff 40a61d0eec Make .dockercfg with json.MarshallIndent 
Fixes #10129
Makes the .dockercfg more human parsable.

Also cleaned up the (technically) racey login test.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b8f7526fc6333e5b67282e5b73eee497dd13ec34
Component: engine
 2015-01-17 07:05:56 -05:00
Jessie Frazelle b873d45d82 Merge pull request #10154 from tianon/fix-x-usage 
Fix "-X" 6l usage ("define string data")
Upstream-commit: 4245952f79106acd0f8125ad05b5f7560f7ae524
Component: engine
 2015-01-16 20:55:16 -08:00
Tianon Gravi 6136e835bf Fix "-X" 6l usage ("define string data") 
It turns out "-X" is only for strings! :)

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: da01690a0a22ced060d4fb4fc46cb545ff1604df
Component: engine
 2015-01-16 21:46:01 -07:00
Abin Shahab 807f07b041 SEND CAPABILITY IDS TO LXC 
Sending capability ids instead of capability names ot LXC for --cap-add and --cap-drop.
Also fixed tests.

Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: bff3509e431ce6d68e2accbb842c99d4abe86e05
Component: engine
 2015-01-17 04:01:52 +00:00
Jessie Frazelle bba3a8213f Merge pull request #10148 from thaJeztah/fix-deprecation-typo 
Fix typo in deprecation message.
Upstream-commit: 78b7a484db5ac876e116eb248f1ba538bcc426a2
Component: engine
 2015-01-16 15:16:54 -08:00
Sebastiaan van Stijn 3968c04241 Fix typo in deprecation message. 
Because the doc maintainers don't like Cockney.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bf14bacac3f1cae15ce7b32b5341122c305e630e
Component: engine
 2015-01-16 23:36:50 +01:00
Jessie Frazelle 611f8510fe Merge pull request #9941 from SvenDowideit/build-pull-option-docs 
Add build --pull and evenets --filter flags to the docs for 1.4
Upstream-commit: 00d19150bb937bcc4572edf1f397d4051abb37c1
Component: engine
 2015-01-16 13:49:56 -08:00
Victor Vieux b329952e86 move test to the daemon 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c6309229a0f5e3d8ee18d7ce80d1d0bd1d193e07
Component: engine
 2015-01-16 21:49:46 +00:00
Jessie Frazelle 712286a324 Merge pull request #10125 from estesp/9960-add-backingfs-info 
Add backing filesystem info to `docker info` command where applicable
Upstream-commit: eaf3c6f1aca3d2e3bd58300781dd31eec93622b1
Component: engine
 2015-01-16 13:41:37 -08:00
Phil Estes 310b2cd524 Add backing filesystem info to docker info command where applicable 
Fixes #9960

This adds the output of a "Backing Filesystem:" entry to `docker info`
to overlay, aufs, and devicemapper graphdrivers. The default list
includes a fairly complete list of common filesystem names from
linux/include/uapi/linux/magic.h, but if the backing filesystem is not
recognized, the code will simply show "<unknown>"

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 48b1dd0084904678728817d728bb9ab1c0183aad
Component: engine
 2015-01-16 14:43:43 -05:00
Derek McGowan ce12855fec Fix failing integration tests 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: f29aacbc4804e3aca1c21b9411e960b2a2543da1
Component: engine
 2015-01-16 11:34:45 -08:00
unclejack 0af8067e20 Merge pull request #10134 from unclejack/bump_go_to_1.4.1 
bump go to 1.4.1
Upstream-commit: 6a6a89a80686667cab70fa71dbcdfa408b252106
Component: engine
 2015-01-16 19:35:47 +02:00
James Turnbull 663b86fdb0 Merge pull request #10127 from fredlf/known-issues 
Adds new section for Known Issues to Release Notes.
Upstream-commit: 30468cdbae6deced7d13a4b3e52033100fe593ec
Component: engine
 2015-01-16 09:45:34 -05:00
Pavel Lobashov 4f77faa073 fix link to introducion on 'Working with Docker Images' page 
Old link go to Table of content page, but by context it should go to 'understaning-docker' pag

Signed-off-by: Pavel Lobashov <shockwavenn@gmail.com>
Upstream-commit: 43b97368422843108a2090633367beaba434245b
Component: engine
 2015-01-16 14:16:10 +03:00
HuKeping e26618d2ee restart: add test for recording restart policy name 
Add test for recording restart policy name on
- restart=no
- restart=always
- restart=on-failure

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: c3ed49dcdb2d835bf4fbdebe3f07318c945282c8
Component: engine
 2015-01-16 17:58:26 +08:00
unclejack f41baa0c49 bump go to 1.4.1 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 933f957e773d5b9da13e32649d0f987b30e87eb5
Component: engine
 2015-01-16 09:45:37 +02:00