docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity
27,053 Commits 12 Branches 297 Tags
2f7517f2b163f985e29b044dfe75fef994b3ad38
Commit Graph

27053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Davis
2f7517f2b1 Merge pull request #26360 from lixiaobing10051267/masterServiceCreate 
remove some incorrect bash symbols
Upstream-commit: a8f79e554270084db03a3916a7271b257ab17801
Component: engine
 2016-09-06 23:51:23 -04:00
lixiaobing10051267
4de3f43e65 remove some incorrect bash symbols 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 2d1d4684f0fc752aae7e41af03a0f1589f11ee00
Component: engine
 2016-09-07 11:44:54 +08:00
Brian Goff
a0f654ae38 Merge pull request #26340 from Microsoft/jjh/blocksinglefilevolume 
Windows: Error if mapping single file volume
Upstream-commit: a123ef1bfa8d52a599ab4e178e0505b54a423126
Component: engine
 2016-09-06 21:06:15 -04:00
Brian Goff
669392fd60 Merge pull request #26281 from LK4D4/fix_multireader_offset 
pkg/ioutils: fix multireader SEEK_CUR branch
Upstream-commit: 2381c7f18df98b3ccc0b5a1236cd8e4ae57ba912
Component: engine
 2016-09-06 20:47:03 -04:00
Brian Goff
8f83f014e7 Merge pull request #26344 from tophj-ibm/change-test-daemon-id-generation 
Integration-cli: change daemon id generation from time to rand
Upstream-commit: 6ae6739af445ec59d9cb9f35f1729ab55a6d3f7a
Component: engine
 2016-09-06 20:42:58 -04:00
Christopher Jones
02397cb234 Integration-cli: change daemon id generation 
Fixes #24805

Changes test daemon id generation from using time.Now().UnixNano() to using
stringid. This is because of a go bug (fixed upstream for 1.8) on ppc64le
and s390x where time.Now().UnixNano() would not return nanosecond precision,
so initializing consecutive daemons sometimes would result in them having
the same id.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 42f3865d248c29b6a9accf7f0c07d766c3b54d4a
Component: engine
 2016-09-06 18:17:24 -04:00
Tõnis Tiigi
43e7345beb Merge pull request #26310 from hqhq/cleanup_pullSchema2 
Cleanup pullSchema2
Upstream-commit: 331e724e87929c47126f27cad1c94447e392c8eb
Component: engine
 2016-09-06 14:35:47 -07:00
Alexander Morozov
5b622d9c5a pkg/ioutils: fix multireader SEEK_CUR branch 
Before getReaderForOffset returned always nil and wrong offset.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f3627c37269d02bacec42831f5a791ae4fd0bc5e
Component: engine
 2016-09-06 11:08:35 -07:00
John Howard
704b11ca3b Windows: Error if mapping single file volume 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1b62b8c08405539c24355bd79a38cddf73c8016f
Component: engine
 2016-09-06 10:52:56 -07:00
Charles Smith
0908488188 Merge pull request #26288 from sfsmithcha/add_tls 
author merge: addressed @diogomonica ' remark: add how pki works topic
Upstream-commit: 75c36bcc64a5597919a16a7d43463f7e7c5e1499
Component: engine
 2016-09-06 10:41:46 -07:00
Charles Smith
565ec12cc7 add how pki works topic 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 5ca3e6e61f5537fa637de9436881402a929bea77
Component: engine
 2016-09-06 10:39:52 -07:00
Phil Estes
1c58f369cd Merge pull request #25950 from akalipetis/fix-#21738-userns-mount-create 
Host mounted directories are correctly chowned to the remapped root, if the directory does not already exist
Upstream-commit: 078964177f3e964774a150d688e5ff2b75220028
Component: engine
 2016-09-06 12:42:39 -04:00
Michael Crosby
656be9ef36 Merge pull request #26294 from petrsvihlik/updated-windows-mounting-example 
Updated Windows mounting example
Upstream-commit: 368a27a8d80337918d465c8c98100a4e22d9ef1a
Component: engine
 2016-09-06 09:05:50 -07:00
Michael Crosby
773fd0e328 Merge pull request #26212 from rhvgoyal/xfs-enospc 
devmapper: Set xfs max_retries to 0 upon ENOSPC
Upstream-commit: 0d03c060c7e6800e60833c4462b917ee9b081440
Component: engine
 2016-09-06 09:03:09 -07:00
Vincent Demeester
8226c5b8ed Merge pull request #26307 from AkihiroSuda/fix-doc-26291 
fix docs about `sudo docker login`
Upstream-commit: da763602afbb25ea4428e1d608af5ee017a0b94e
Component: engine
 2016-09-06 17:47:46 +02:00
Vincent Demeester
31121e2eeb Merge pull request #26258 from mstanleyjones/25625_swarm_init_return_value 
Add response to swarm/init example (fixes #25625
Upstream-commit: d4e173fc347911999458eb82fe4c0fd1b3818218
Component: engine
 2016-09-06 17:43:19 +02:00
Misty Stanley-Jones
56f38b6496 Add response to swarm/init example (fixes #25625 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: a2a0a03e2b801545b2e3fb9e8476c76370da9175
Component: engine
 2016-09-06 08:39:53 -07:00
Doug Davis
a9c8ed7d76 Merge pull request #26337 from icaoweiwei/patch_2016-09-06_1 
Remove redundant word
Upstream-commit: 1c7c298d2b22e6a3739e20ea1b63f61a90dda4e0
Component: engine
 2016-09-06 11:24:22 -04:00
Cao Weiwei
0f214edc49 Remove redundant word 
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
Upstream-commit: c6edecc2d67b8e4659873fe9a960d76f7b2f82f4
Component: engine
 2016-09-06 23:21:41 +08:00
Vincent Demeester
392f4993c4 Merge pull request #26282 from mstanleyjones/26280_fix_pretty_print 
`docker node inspect <node> --pretty`  needs an extra newline at the end
Upstream-commit: 5c6b54c278e9639e7b21908315ff986ac812d4fe
Component: engine
 2016-09-06 16:04:55 +02:00
Vincent Demeester
87b65ede10 Merge pull request #26293 from lixiaobing10051267/masterDockerAttach 
fix the wrong option info while specifying the command with the "--help"
Upstream-commit: d8e151535017b4bb4ee5aa8281f1b9bb7bffa397
Component: engine
 2016-09-06 15:44:44 +02:00
Brian Goff
3200975590 Merge pull request #26304 from OctopusDeploy/26178-env-vars-with-equals 
Allow windows environment variables to contain `=`
Upstream-commit: 778acfdf099894332f6944e7643ee20d8f14387d
Component: engine
 2016-09-06 09:32:40 -04:00
Brian Goff
da767844c5 Merge pull request #26328 from allencloud/correct-docker-volume-ls-description 
correct docker volume ls subcommand description
Upstream-commit: 3dd6e38b08d47bc7084502d969365ab74f54847f
Component: engine
 2016-09-06 09:26:09 -04:00
allencloud
bf0c3d33a0 correct docker volume ls subcommand description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 2087f94df57473f553972236c9a5e63fb694a664
Component: engine
 2016-09-06 17:18:41 +08:00
Vincent Demeester
1092bf17b8 Merge pull request #26313 from yongtang/26312-network-ls-help-output-volume 
Fix incorrect help output in `docker network ls`
Upstream-commit: 1325cde252cd3f117c56a51fd2292194e9f68631
Component: engine
 2016-09-05 19:13:09 +02:00
Vincent Demeester
bd7ffc7bd6 Merge pull request #26320 from yongtang/09052016-man-docker-create 
Update man page for `docker create` to add `--rm` flag
Upstream-commit: d7594d23c81ad3de47bba933bb8f9041435a6226
Component: engine
 2016-09-05 18:40:07 +02:00
Yong Tang
8940978cd5 Update man page for docker create to add --rm flag 
The `--rm` flag has been part of the `docker create` and
related docs in `docs/reference/commandline/create.md`
already includes the `--rm` flag. However, man page
`man/docker-create.1.md` has not adds the `--rm` flag yet.

This fix adds the description of `--rm` flag to
`man/docker-create.1.md`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6ac8224207a99f7057222fb0b36f4a0bdcc1197c
Component: engine
 2016-09-05 08:38:32 -07:00
Yong Tang
c53f181a9b Fix incorrect help output in docker network ls 
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b9e46235fadc6b390e2c04c44b6a865e4ea97cb8
Component: engine
 2016-09-05 08:24:22 -07:00
Vincent Demeester
a5e3c6ff62 Merge pull request #26292 from lixiaobing10051267/masterDockerPull 
modify output info for docker pull centos
Upstream-commit: 175188d8b0eb976cceb6c46de439186eec98e40e
Component: engine
 2016-09-05 15:44:01 +02:00
Sven Dowideit
76133d15d2 Merge pull request #26314 from unclejack/docs_contiv_nfs 
docs: mention NFS support for Contiv volume plugin
Upstream-commit: 8f424f777438169edda354ab82fca9f81c7aab4a
Component: engine
 2016-09-05 21:51:42 +10:00
unclejack
a4d0659867 Merge pull request #26199 from bamarni/raspbian-overlay 
remove systemd drop-in unit on raspbian
Upstream-commit: 9fbe0f21565e9ef41393d5f211e9a7e5a51d0adc
Component: engine
 2016-09-05 04:45:47 -07:00
Vincent Demeester
7f9029e938 Merge pull request #26233 from yuexiao-wang/fix-readme 
Fix readme doc for dockerd
Upstream-commit: 1145c9b0d59dd1210e71799a68addee23884861b
Component: engine
 2016-09-05 13:39:19 +02:00
Antonis Kalipetis
0192bac2c8 Add test for checking created directories on remapped root 
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
Upstream-commit: c6bff578b4f169e2fbd67dfbe9f0ac147fc8c255
Component: engine
 2016-09-05 13:02:13 +03:00
Antonis Kalipetis
9a0304155e Make host directory mounts use idtools.MkdirAllNewAs 
This makes sure that:
1. Already existing directories are left untouched
2. Newly created directories are chowned to the correct root UID/GID in case of user namespaces
3. All parent directories still get created with host root UID/GID

Fix #21738

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
Upstream-commit: 72d8a77d522896ec73e07f49a1c1bcb44bbf3bbd
Component: engine
 2016-09-05 12:46:57 +03:00
unclejack
f4b10db50e docs: mention NFS support for contiv volume plugin 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: faaccf26e3936fd34c049267a17b6a34e06a2b4d
Component: engine
 2016-09-05 12:38:50 +03:00
Vincent Demeester
aabe996fb1 Merge pull request #26236 from yuexiao-wang/remove-h-option 
Remove -h option for docker cli
Upstream-commit: 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b
Component: engine
 2016-09-05 09:52:18 +02:00
Qiang Huang
eae30caa81 Cleanup pullSchema2 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: cec0e2dfbddac0bf1362cfbfc94d8d4003c7da36
Component: engine
 2016-09-05 15:02:14 +08:00
Akihiro Suda
c84cf3cf3a fix docs about sudo docker login 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: d6007b4db0c2dc788fc0b1d2e2c5e95a5fa0701f
Component: engine
 2016-09-05 04:44:18 +00:00
Madhu Venugopal
06f15b681c Merge pull request #26297 from yongtang/26220-disconnect-container-from-network 
Fix issue in disconnecting a container from network
Upstream-commit: 506c51e71e5a424175ed837aee5a304e0bc2c214
Component: engine
 2016-09-04 21:15:39 -07:00
Sven Dowideit
509edc829c Merge pull request #26302 from vdemeester/health_status-in-event-docs 
Add health status as action on events documentations
Upstream-commit: b468df9eac16d73c9b8e4853411df1fafea37d1f
Component: engine
 2016-09-05 10:03:14 +10:00
Sven Dowideit
f1e49b9e9a Merge pull request #26245 from dbdd4us/master 
add volumes, networks, nodes and services into label doc
Upstream-commit: 384de833c0f7e20d6a36b6786d1f2e2e67b90d2f
Component: engine
 2016-09-05 10:02:35 +10:00
Matt Richardson
f5573135ab Allow windows environment variables to contain = 
Fix issue where environment variables with embedded equals signs were
being dropped and not passed to the container.

Fixes #26178.

Signed-off-by: Matt Richardson <matt.richardson@octopus.com>
Upstream-commit: bc8eabce252e8363263e9baacdeb1de508029d06
Component: engine
 2016-09-05 08:49:07 +10:00
Vincent Demeester
5599c8776d Add health status as action on events documentations 
This was missing from the docs for 1.12.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fb8b6438f265532ec47e001b2739ed614b47f3a0
Component: engine
 2016-09-04 18:01:57 +02:00
Yong Tang
edfe468b08 Fix issue in disconnecting a container from network 
This fix tries to address the issue raised in 26220 where
disconnecting a container from network does not work if
the network id (instead of network name) has been specified.

The issue was that internally when trying to disconnecting
a contaienr fromt the network, the originally passed network
name or id has been used.

This fix uses the resolved network name (e.g., `bridge`).

An integration test has been added to cover the changes.

This fix fixes 26220.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 83d79f13aa2e94085e83e0f5bc5d51305dd2c192
Component: engine
 2016-09-04 07:28:45 -07:00
lixiaobing10051267
9e0fb207fb fix the wrong info while specifying the command with the "--help" 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 2626d341e7b39d5d6182d8af0cec425420f8f176
Component: engine
 2016-09-04 04:26:56 +08:00
Brian Goff
96c3a68eb8 Merge pull request #26279 from miaoyq/delete-a-useless-funtion 
delete a function which isn't used in the project
Upstream-commit: 93a8b5c42be79ae2ed5c956dfbb39da8e1f6d78b
Component: engine
 2016-09-03 13:36:37 -04:00
Vincent Demeester
637e45cd56 Merge pull request #26290 from tonistiigi/govet17 
Fix govet for go1.7
Upstream-commit: c73fae2352788323476759f4199b034b7ffc54dd
Component: engine
 2016-09-03 19:27:19 +02:00
Petr Švihlík
8c44f51734 Updated Windows mounting example 
Signed-off-by: Petr Švihlík <svihlik.petr@gmail.com>
Upstream-commit: ea0d7b1b3b4d89e7601cb93740fa9ee0e000dd9f
Component: engine
 2016-09-03 18:23:43 +02:00
lixiaobing10051267
4e526a616e modify output info for docker pull centos 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 6becc1a5774e391a3dcade645cdeff46577bf6fa
Component: engine
 2016-09-03 22:27:18 +08:00
Tonis Tiigi
833a33ebb8 Fix govet for go1.7 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7a8c7b47cffa8485b03db715f78c087b01ae5dfa
Component: engine
 2016-09-02 19:07:54 -07:00