1
0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Commit Graph

28346 Commits

Author SHA1 Message Date
epeterso
0c5998d38f remove world/group writable perms
change files from being written with group and world writable permissions.

Signed-off-by: epeterso <epeterson@breakpoint-labs.com>
Upstream-commit: 3ec8fed7476704f061891d4c421c615da49e30c7
Component: engine
2016-11-01 16:18:15 -04:00
Alexander Morozov
437925ef82 Merge pull request #27929 from daehyeok/logrus_refactoring
Fix logrus formatting
Upstream-commit: bf16fa47b7fcf5133818cd12bab1c2f60ba8d363
Component: engine
2016-11-01 11:12:46 -07:00
Doug Davis
d701a23f2e Merge pull request #27926 from miaoyq/optimized-indentation-of-codes-and-fix-two-typos
Optimized the indentation of codes and fix two typos
Upstream-commit: 4f347e2db2a3c181861c4e2a82ede2ea1d84e712
Component: engine
2016-11-01 11:36:53 -04:00
Sebastiaan van Stijn
1a1be648b1 Merge pull request #27931 from thaJeztah/add-akihiro-to-maintainers
add Akihiro to maintainers
Upstream-commit: ad4cce1573123f697ad794a680b3a4cd2cc613d2
Component: engine
2016-11-01 07:52:19 -07:00
Doug Davis
d8e464eab6 Merge pull request #27412 from loftylabs/26249-make-unused-args-warning
Convert Unused ARG error to warning
Upstream-commit: f8d5d65fb86c6d6c5268c1d8cb20c3aa1725c726
Component: engine
2016-11-01 08:47:03 -04:00
Doug Davis
d98705837f Merge pull request #27930 from YuPengZTE/devLogout
Align with other cli descriptions
Upstream-commit: 28dfeec2386a7096dcd22be5d1ae043b87fbf6a3
Component: engine
2016-11-01 08:39:04 -04:00
Sebastiaan van Stijn
a20d6356d6 add Akihiro to maintainers
This adds Akihiro as a maintainer for
docker/docker, as was proposed and
voted on the maintainers mailinglist.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bc571700d2c720a44ee862e5a325bfcf7b781c97
Component: engine
2016-10-31 23:06:05 -07:00
yupeng
c876442145 Align with other cli descriptions
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 06f160237426e705ed214a4f087d4aeea32c0a8b
Component: engine
2016-11-01 13:41:49 +08:00
Daehyeok Mun
07a831dfc2 Fix logrus formatting
This fix tries to fix logrus formatting by removing `f` from
`logrus.[Error|Warn|Debug|Fatal|Panic|Info]f` when formatting string
is not present.

Fixed issue #23459

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: fa710e504b0e3e51d4031790c18621b02dcd2600
Component: engine
2016-10-31 22:05:01 -06:00
Addam Hardy
bedb3b19ee Convert Unused ARG error to warning
Signed-off-by: Addam Hardy <addam.hardy@gmail.com>
Upstream-commit: f150f42009dddb4f9b8d4ceef8763af701b0d0f9
Component: engine
2016-10-31 21:42:50 -05:00
Vincent Demeester
80b8147332 Merge pull request #27916 from dnephin/refactor-client
Refactor client/request.go
Upstream-commit: d8d33148d809ec97794bbd492617b1be677cf820
Component: engine
2016-11-01 03:39:06 +01:00
Yanqiang Miao
d5eeee5956 Optimized the indentation of codes and fix two typos
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: a9b6319e67bc4485df7210e3226d8940ab44962f
Component: engine
2016-11-01 10:35:18 +08:00
Tibor Vass
60ab876d91 Merge pull request #26471 from yongtang/22717-workdir-windows
Use `filepath.Clean` in `normaliseWorkdir` for windows
Upstream-commit: 8cced8702261224ffd726774812eb50e8a600e52
Component: engine
2016-10-31 15:02:18 -07:00
Daniel Nephin
a2eb4ad244 Refactor client/request
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d32ffb72b7a9979448345947b27347f3adfa8460
Component: engine
2016-10-31 17:36:49 -04:00
Sebastiaan van Stijn
b1a5cbe26a Merge pull request #27901 from ripcurld00d/load_stdin_valid
Validate docker-load receives a tar file
Upstream-commit: c600cfa93ccdbebf739a494efcd5742839fc6c6b
Component: engine
2016-10-31 14:23:18 -07:00
Sebastiaan van Stijn
63adf4cb5d Merge pull request #26683 from yuexiao-wang/update-inspect
Modify short and flags for docker inspect
Upstream-commit: a13fc3fd367437a779d3562093bbc9f499816733
Component: engine
2016-10-31 13:39:59 -07:00
Yong Tang
7a6b35c7c0 Use filepath.Clean in normaliseWorkdir for windows
As is seem in the comment of `normaliseWorkdir` for windows:
```
...
	//	WORKDIR c:\\foo                 --> C:\foo
	//	WORKDIR \\foo                   --> C:\foo
...
```

However, this is not the case in the current implementation because
`filepath.FromSlash` is used and `FromSlash` does not replace multiple
separator with a single one (`file.Clean` does).
So `normaliseWorkdir` does not truly normalize workdir.

This fix changes the implementation of `normaliseWorkdir` and use
`filepath.Clean` instead of `filepath.FromSlash`.

Additional test cases have been added to the unit test.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6f7e8d1d7fb94c89dc3d886dd131173d58aa10f0
Component: engine
2016-10-31 13:27:05 -07:00
Brian Goff
39c0d0f084 Merge pull request #27648 from dnephin/swagger-gen-operations
Generated more api types from swagger spec
Upstream-commit: 2fc760496b24cc1d42d5527ec593b0e1b1701d54
Component: engine
2016-10-31 15:33:16 -04:00
Sebastiaan van Stijn
0fa1e11138 Merge pull request #27907 from vdemeester/pr-27822
Updating aws-sdk-go to version 1.4.22
Upstream-commit: 88c825268686e633603f64a75b805e0294aee02c
Component: engine
2016-10-31 11:21:06 -07:00
Vincent Demeester
d674b1fc4d Merge pull request #27884 from Microsoft/jjh/copyfiletodot
Windows: Fix COPY file . after WORKDIR
Upstream-commit: a0629eab7302bef57c9ce9930b24f59f751303d7
Component: engine
2016-10-31 17:54:44 +01:00
Laura Frank
68afbb36f4 Updating aws-sdk-go to version 1.4.22
Signed-off-by: Laura Frank <ljfrank@gmail.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ba4e0c328f96e6a6caa6c67e3ee4d446d75a584f
Component: engine
2016-10-31 09:23:45 -07:00
Brian Goff
cc1e62247e Merge pull request #27782 from tombooth/27779-decouple-watcher-close
Decouple removing the fileWatcher from reading
Upstream-commit: 0cdcb9ea7350b1e0a024bf40c8cf60e541f2c69f
Component: engine
2016-10-31 11:50:26 -04:00
Daniel Nephin
2c5782817e Generate ContainerWait response from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 181562c2e54225d6ce737d98b03d3157451a5dbc
Component: engine
2016-10-31 11:19:53 -04:00
Daniel Nephin
bc7bcb9601 generate AuthResponse type from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2732b8a9bb3edb92121d0b0dcc144e5f557e2fbf
Component: engine
2016-10-31 11:16:03 -04:00
Daniel Nephin
1b85879c03 Generate container update response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f196cf6a090556ccb42198043a71d133482b510d
Component: engine
2016-10-31 11:16:02 -04:00
Daniel Nephin
1759ab5e8b Use IDResponse for container create response.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c8d5e7203e1ae140a5cca312b6699063b521cf83
Component: engine
2016-10-31 11:16:02 -04:00
Daniel Nephin
01541139a5 Add an IDResponse type
Generated from a swagger spec and use it for container exec response

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 01883c136d9ef06962d80aa81e27d1d90eb6d199
Component: engine
2016-10-31 11:16:02 -04:00
Daniel Nephin
913e9a48c1 Generate container create response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bad849fc826b410c3aeb753a8c7f6b38f7ae12b0
Component: engine
2016-10-31 11:16:02 -04:00
Daniel Nephin
dc10e9a664 Use a config to generate swagger api types
Moves the resposne types to a package under api/types

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 29df3bdb117a058ae040686dd0f2565ae9ad743a
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
52c74e2725 Update to inline comments.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8f81bb92a3e528d0b5facadd55738aefc279caf8
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
b705a36179 Cleanup network swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 52a4737319b4008a0b636319905e2bfc7b3225ad
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
d19255532a Generate VolumesCreateRequest from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5c2498fd3c41f4badb1788665886d30772537f73
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
fa3a1f0666 Generate ErrorResponse struct from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bc757385455dee272ca563031afece05c935320b
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
914619c6f3 Cleanup volume swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 84a39c0830a3c9fa91d65db201ed9a925af7bfe6
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
31c5c30bb3 Generate VolumeList response from the swagger spec
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d459e83b1c993d63d5f94b85a7f8ddf3ac01beae
Component: engine
2016-10-31 11:13:41 -04:00
Boaz Shuster
5209994e39 Validate docker-load receives a tar file
To load an image from a tar file, you can specify
the tar file in the -i/--input option:
docker load -i image_1.tar

or using stdin:

docker load < image_1.tar
cat image_1.tat | docker load

If the image file isn't given the `docker load`
command gets stuck.

To avoid that, the load makes sure the CLI input is
not a terminal or the `--input` option was set.
If not then an error message is shown.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 4426189b35aee4a64bedfb48604ad342a3a5b946
Component: engine
2016-10-31 15:30:55 +02:00
yuexiao-wang
613dd5861e Modify short and flags for docker inspect
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: cc03984e17f77ce1ad3f41e815a616405b6ffc76
Component: engine
2016-10-31 18:11:25 +08:00
John Howard
27e4d0d0fb Windows: Fix COPY file . after WORKDIR
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f0b93b6ed8b4c0776065be972b4d5b4611f25fbf
Component: engine
2016-10-30 13:12:27 -07:00
Vincent Demeester
d375460d63 Merge pull request #27879 from sdurrheimer/zsh-completion-ps-health-filter
Add zsh completion for 'docker ps --filter health='
Upstream-commit: 17aaa0890a7f53cbd9c8806a93de73898ea92813
Component: engine
2016-10-29 19:23:55 +02:00
Sebastiaan van Stijn
596b96c39e Merge pull request #27881 from albers/completion-ps--filter-health
Add bash completion for `docker ps --filter health`
Upstream-commit: e1369f2f394bde84f9d0a3b262a9ce94971e039b
Component: engine
2016-10-29 10:05:24 -07:00
Doug Davis
d4dfe8f046 Merge pull request #27878 from hqhq/fix_typos
Fix bunch of typos
Upstream-commit: 72ec0f3488324e1cd622b78e3ea746981f558b60
Component: engine
2016-10-29 07:50:45 -04:00
Harald Albers
4011d7083d Add bash completion for docker ps --filter health
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5e6a59b59f567d5e69d9ae9df98a89a69b2664bd
Component: engine
2016-10-29 04:26:08 -07:00
Steve Durrheimer
1fda59702c Add zsh completion for 'docker ps --filter health='
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8df3d6a2a7e02ff1c7baf0a273d20b2422e38f39
Component: engine
2016-10-29 12:13:29 +02:00
Qiang Huang
34bac6f06e Fix bunch of typos
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
2016-10-29 15:03:26 +08:00
Vincent Demeester
0be42defbd Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format
Fixes #24022 - Adds container health support to docker ps filter/format
Upstream-commit: 515e5dade7a006dbd2c42880f1af695da22ece60
Component: engine
2016-10-29 06:56:06 +02:00
Sebastiaan van Stijn
d85153c870 Merge pull request #27874 from duglin/addComment
Add a comment about how we don't mkdir during WORKDIR directly
Upstream-commit: 507b4e9e4aed26170802b2691e47c59b2c6cf403
Component: engine
2016-10-28 21:03:47 -07:00
Doug Davis
0d12f299cb Add a comment about how we don't mkdir during WORKDIR directly
Just to help the next time someone goes looking for it while debugging.
Like @jhowardmsft and I did while looking at #27545.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9f79043a63302258a597a69b0c5ec5e09a480ac0
Component: engine
2016-10-28 19:24:37 -07:00
Vincent Demeester
4e9b278e51 Merge pull request #27840 from estesp/add-userns-status-to-info
Add "userns" to `docker info` security options output
Upstream-commit: 1fb9c4e89188f48c79889f6128fdec865bed467d
Component: engine
2016-10-29 02:58:34 +02:00
Sebastiaan van Stijn
ed6994ddbe Merge pull request #27844 from LK4D4/fix_build_rpm
project: fix build rpm
Upstream-commit: cff976a0b8a52ff2baee3f3cc503276862278153
Component: engine
2016-10-28 16:50:58 -07:00
Sebastiaan van Stijn
092d6f43e2 Merge pull request #27867 from Microsoft/jjh/difftest
Windows: Port a docker diff test
Upstream-commit: a0eae7e3c0e037f73445a4f77a4dfcd1042be75c
Component: engine
2016-10-28 16:44:03 -07:00