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
23,972 Commits 12 Branches 297 Tags
490a37a62ff31a0850bfafbf67d6ffedb9543821
Commit Graph

23972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
490a37a62f Add support for reloading daemon configuration through systemd 
This adds support for reloading the docker daemon
(SIGHIUP) so that changes in '/etc/docker/daemon.json'
can be loaded at runtime by reloading the service
through systemd ('systemctl reload docker')

Before this change, systemd would output an error
that "reloading" is not supported for the docker
service;

  systemctl reload docker
  Failed to reload docker.service: Job type reload is not applicable for unit docker.service.

After this change, the docker daemon can be reloaded
through 'systemctl reload docker', which reloads
the configuration;

  journalctl -f -u docker.service

  May 02 03:49:20 testing systemd[1]: Reloading Docker Application Container Engine.
  May 02 03:49:20 testing docker[28496]: time="2016-05-02T03:49:20.143964103-04:00" level=info msg="Got signal to reload configuration, reloading from: /etc/docker/daemon.json"
  May 02 03:49:20 testing systemd[1]: Reloaded Docker Application Container Engine.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f74b856e1ac2805fe48ceb52bc83cd7a3cec870c
Component: engine
 2016-05-02 10:27:07 +02:00
Sebastiaan van Stijn
8e492423bb Merge pull request #22439 from sunyuan3/the 
remove "the" in docs.
Upstream-commit: b0a5762348f3810b67ef3804a464961812d18eb6
Component: engine
 2016-05-01 13:50:41 +02:00
Yuan Sun
ef3d0f56d0 remove "the" in docs. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 043c9ef076477a391a58792930100402b48bbe1e
Component: engine
 2016-05-01 15:37:11 +08:00
Brian Goff
8a3d4c08a9 Merge pull request #22434 from sdurrheimer/zsh-completion-network-ls-driver-filter 
Add zsh completion for 'docker network ls -f driver'
Upstream-commit: e385faa35b5026ed27f59124d632ea30e9d647d1
Component: engine
 2016-04-30 10:54:28 -04:00
Antonio Murdaca
04f7572de5 Merge pull request #22282 from fntlnz/docs-authorization-plugins 
Mention the fact that authz plugins are available today
Upstream-commit: d32345240c39b990a00d5d3e740a90a1f57d1251
Component: engine
 2016-04-30 13:23:58 +02:00
Steve Durrheimer
236d071954 Add zsh completion for 'docker network ls -f driver' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d6780c319086379023894c6ae26301bce6b01b98
Component: engine
 2016-04-30 13:07:03 +02:00
Vincent Demeester
d380357613 Merge pull request #22319 from thaJeztah/network-driver-filter 
Add "driver" filter for network ls
Upstream-commit: 7a5658129740cd8e4345246758aa30fe3c835d10
Component: engine
 2016-04-30 10:38:10 +02:00
David Calavera
9d2d2e1d41 Merge pull request #22372 from dnephin/cli_cleanup 
Reorganize client and cli packages
Upstream-commit: 90dfb3dacc56d789b70f5b5f3da6791465706c6c
Component: engine
 2016-04-29 17:31:39 -07:00
David Calavera
dd55588acd Merge pull request #22426 from sdurrheimer/zsh-completion-network-ls-filters 
Add zsh completion for 'docker network ls -f {id,name,type}'
Upstream-commit: b391a5914c5cd040f9f85ceaab04cafca6c34461
Component: engine
 2016-04-29 17:29:38 -07:00
Sebastiaan van Stijn
55b8abe106 Merge pull request #22241 from bfirsh/update-remote-api-client-libraries-page 
Update remote API client libraries page
Upstream-commit: cd418701326f91c71194e2e09d71a0692705de78
Component: engine
 2016-04-30 00:39:29 +02:00
Alexander Morozov
98448735e8 Merge pull request #22427 from tonistiigi/simplify-blkio 
Simplify blkio resources setup in spec
Upstream-commit: 5e58a583fc0a9dd208c60690bdc7580209446e93
Component: engine
 2016-04-29 15:16:33 -07:00
Sebastiaan van Stijn
f2a5bf90ee Merge pull request #22406 from allencloud/fix-typos 
fix typos in CHANGELOG.md and pull.go
Upstream-commit: e44a868bc4a0fa2cd2cd3a3b269870ed745da50b
Component: engine
 2016-04-30 00:00:48 +02:00
Tonis Tiigi
d2c630a173 Simplify blkio resources setup in spec 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 668f0a2a4c04e550c957cf5eff6618c6b40d1252
Component: engine
 2016-04-29 13:39:04 -07:00
Steve Durrheimer
295ba6c97d Add zsh completion for 'docker network ls -f {id,name,type}' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8a51f9511cffd8d95dd46fc1b3663a7e7e543949
Component: engine
 2016-04-29 22:38:10 +02:00
Doug Davis
e0bc3fa222 Merge pull request #22417 from michael-holzheu/s390x-dockerfile-add-registry-and-notary 
Dockerfile.s390x: Build correct registries and notary client
Upstream-commit: aa537a367c72174ac01fb64d6c86721c9a20bb0b
Component: engine
 2016-04-29 13:59:14 -04:00
John Howard
3f31ac2b65 Merge pull request #22340 from Microsoft/jstarks/split-service 
Windows: Support running dockerd as a service
Upstream-commit: f114ab21de33062c8b1db83ecd772691b9ec05c4
Component: engine
 2016-04-29 10:47:20 -07:00
Vincent Demeester
6e47a4bf6c Merge pull request #22419 from cpuguy83/reflection_is_for_mirrors 
Remove reflection on CLI init
Upstream-commit: 9a58dd22f05fded46665edb10aabcf0551176863
Component: engine
 2016-04-29 19:42:19 +02:00
Michael Holzheu
943ca18608 Dockerfile.s390x: Build correct registries and notary client 
Sync with other Dockerfiles:

 1) Adjust REGISTRY_COMMIT
 2) Add old shema1 registry
 3) Install notary client

This fixes the following testcases:

 DockerSchema1RegistrySuite:
  - SetUpTest
 DockerTrustSuite:
  - TestTrustedBuildTagFromReleasesRole
  - TestTrustedBuildTagIgnoresOtherDelegationRoles
  - TestTrustedPullReadsFromReleasesRole
  - TestTrustedPullIgnoresOtherDelegationRoles
  - TestTrustedPushWithReleasesDelegationOnly
  - TestTrustedPushSignsAllFirstLevelRolesWeHaveKeysFor
  - TestTrustedPushSignsForRolesWithKeysAndValidPaths
  - TestTrustedPushDoesntSignTargetsIfDelegationsExist
 DockerRegistrySuite:
  - TestPullManifestList
  - TestCrossRepositoryLayerPush
 DockerHubPullSuite:
  - TestPullAllTagsFromCentralRegistry

v2: Sync comments on all architectures

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 6e4c87c06e95f8c1aea0fa6d6575ff8c9faf8e03
Component: engine
 2016-04-29 19:24:49 +02:00
Brian Goff
b5a44200d5 Remove reflection on CLI init 
before:
```
$ time docker --help
real  0m0.177s
user  0m0.000s
sys 0m0.040s
```

after:
```
$ time docker --help
real  0m0.010s
user  0m0.000s
sys 0m0.000s
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5c8950e84d2384919f45209f8cc4cbf00ff29015
Component: engine
 2016-04-29 11:57:46 -04:00
Sebastiaan van Stijn
a1b67ec8fd Merge pull request #22418 from thaJeztah/update-event-api-docs 
update API example response for docker events
Upstream-commit: 55bc0a344085338826bca00ea75ffb9e4b5e0c79
Component: engine
 2016-04-29 17:53:16 +02:00
Sebastiaan van Stijn
7c03d41081 update API example response for docker events 
the events API was rewritten in 723be0a3325799fd6b2a6b689af54f5a07edf992,
but the example response in the documentation doesn't reflect the actual output

this fixes the example response

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3932d46a7878e3e75d8119f332b927fd2107cb32
Component: engine
 2016-04-29 17:37:04 +02:00
allencloud
7762c76c64 fix typos in CHANGELOG.md and pull.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1ac4c61c10b7753607d8cb17421b90475c1bd0d6
Component: engine
 2016-04-29 23:33:15 +08:00
Sebastiaan van Stijn
6e410ce449 Add "driver" filter for network ls 
This add a new filter to 'docker network ls'
to allow filtering by driver-name.

Contrary to "ID" and "name" filters, this
filter only supports an *exact* match.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 23e418b6c966a43a463a064053ce0c741b8e5159
Component: engine
 2016-04-29 16:22:26 +02:00
Doug Davis
19786ac0a4 Merge pull request #22202 from michael-holzheu/s390x-add-libseccomp-2.3.0 
Dockerfile.s390x: Add upstream libseccomp to compile runc
Upstream-commit: 24a8de2b60c68c72924d61cb0c4587944e3be5b4
Component: engine
 2016-04-29 08:13:13 -04:00
Brian Goff
a625365923 Merge pull request #22370 from mlaventure/fix-experimental-builder 
Allow specifying the apt mirror to use when generating deb packages
Upstream-commit: 717842fbdeeec3e3bd56525e998a2ffcb087b4d0
Component: engine
 2016-04-28 16:26:29 -04:00
Kenfe-Mickael Laventure
ebb9e8de8c Allow specifying the apt mirror to use when generating deb packages 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: d0a65a03e9f789b73956e2d30447a385d6531dfe
Component: engine
 2016-04-28 13:05:34 -07:00
Brian Goff
8d43701c21 Merge pull request #22388 from fy2462/exec-add-newline 
Fix bug: exec non-exist command miss a "\n"
Upstream-commit: ca611fdea28ea559f689df97484564bebf5d472b
Component: engine
 2016-04-28 11:30:28 -04:00
Brian Goff
35425a4320 Merge pull request #21613 from wzyboy/support-unixgram-syslog-address 
Support unixgram syslog address
Upstream-commit: dbee44c9e0d9f8afbbb86efd2c0bcbd66440cbbc
Component: engine
 2016-04-28 11:06:17 -04:00
Sebastiaan van Stijn
1bab3fd622 Merge pull request #22396 from sbellem/docs-typo-fix 
Fix typo
Upstream-commit: 0bb4c902e091762e88d54699ba7677c9e62a3cbd
Component: engine
 2016-04-28 15:27:28 +02:00
Sylvain Bellemare
507bf1ac80 Fix typo 
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io>
Upstream-commit: 63aa03ce0a9d2390f684da3403c1cd0e004592d1
Component: engine
 2016-04-28 15:15:08 +02:00
Brian Goff
459ceabfe5 Merge pull request #22391 from thaJeztah/update-changelog-in-master 
merge changelog for v1.11.1 into master
Upstream-commit: feb8f0e10ea151608ed793ec0a88c1a3749f896d
Component: engine
 2016-04-28 09:11:25 -04:00
Sebastiaan van Stijn
dd728e39c9 Merge pull request #22320 from thaJeztah/docs-remove-duplicate-sentence 
docs: remove duplicate line in "Understand the architecture"
Upstream-commit: d37e22b6237ba99adacf200e823d50aade38c551
Component: engine
 2016-04-28 12:45:08 +02:00
Antonio Murdaca
d722206339 Merge pull request #22344 from cpuguy83/seccomp_for_centos 
centos:7/oraclelinux:7 now includes libseccomp 2.2.1
Upstream-commit: 09021d6841b825dbaab901a34617358b03ae17ac
Component: engine
 2016-04-28 12:26:22 +02:00
Kenfe-Mickael Laventure
122b55086b Add changelog for v1.11.1 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 4146b8b69b4fcc5a6ddbbac63f316695c2dbbb8f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ca0c1becea921300599b44dc5b4f2d6e463309ec
Component: engine
 2016-04-28 12:15:17 +02:00
Sebastiaan van Stijn
da56d24b50 Merge pull request #22269 from coolljt0725/skip 
Skip TestBuildNotVerboseFailure if no network
Upstream-commit: bf7307558e42e0ad9f41316f397d880e6d4981b6
Component: engine
 2016-04-28 11:19:56 +02:00
fy2462
1f29278b9e Fix bug: exec non-exist command miss a "\n" 
When exec a non-exist command, it should print a newline at last.

Currently:
```
$ docker exec -ti f5f703ea2c0a144 bash
rpc error: code = 2 desc = "oci runtime error: exec failed: exec:
\"bash\": executable file not found in $PATH"$
```

Signed-off-by: Feng Yan <fy2462@gmail.com>
Upstream-commit: 8bf5613c1aca634e517e895e90e74f4263cf030f
Component: engine
 2016-04-28 16:39:00 +08:00
Vincent Demeester
3cf7d71fdb Merge pull request #21641 from yongtang/21595-discrepancy-on-hostname-validation 
API/CLI discrepancy on hostname validation (#21595).
Upstream-commit: 78eb8a5fb932c2b11df47e7a22c05fe485e03adb
Component: engine
 2016-04-28 09:25:13 +02:00
Zhuoyun Wei
48a9de5e52 Support unixgram syslog address 
- Consider unixgram:// as a valid URL prefix
- Parse unixgram:// addresses
- Update docs

Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org>
Upstream-commit: 57fad95e4352c72c852d740e54fd693a446c552f
Component: engine
 2016-04-28 11:04:50 +08:00
Lei Jitang
600e267c7f Skip TestBuildNotVerboseFailure if no network 
TestBuildNotVerboseFailure use a non-exist image busybox1,
it requires network connection to access to Dockerhub, skip
this test if there is no network.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 9ab0aa43365cd648d7681a58b60e91f791bc920a
Component: engine
 2016-04-27 21:29:05 -04:00
Sebastiaan van Stijn
9074d644d1 Merge pull request #22362 from ZJU-SEL/update-doc 
update cgroup link in doc of run
Upstream-commit: deb6ea4702924ff390e4a57414f735b18e4d7185
Component: engine
 2016-04-28 00:48:47 +02:00
Alexander Morozov
8e3735bee6 Merge pull request #22361 from duglin/removeCR 
Remain extra \n on INFO log msg
Upstream-commit: 1158c921ab49793d87fc35e15eff23434822d6ab
Component: engine
 2016-04-27 12:05:10 -07:00
Daniel Nephin
77424ecdbc Consolidate the files in client/ 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 01a34e43b3f7a701ee1112b960740a5aaa6bdb93
Component: engine
 2016-04-27 14:53:36 -04:00
Daniel Nephin
6f2f3ad4cc Refactor cliconfig so that the default constructor can exist in the package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 30e3620eaea88cf33fd7deb8c88359469c27b3f7
Component: engine
 2016-04-27 14:25:47 -04:00
Daniel Nephin
63df8770d3 Cleanup the structure of the cli package. 
Move all flags into cli/flags
Move usage help into cli/usage.go

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 33c9edaf6c5401fc1891713d1ad8d861e6cea51f
Component: engine
 2016-04-27 14:25:47 -04:00
moxiegirl
7b8da9de87 Merge pull request #22229 from riyazdf/notary-doc-update 
Update DCT docs with 1.11 info, fix typos
Upstream-commit: 861815a3252b88a118a91a164246401fa24fa549
Component: engine
 2016-04-27 09:59:30 -07:00
Riyaz Faizullabhoy
e27d461e96 Update DCT docs with 1.11 info, fix typos 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 77da3bcb72ba4f936c428cb2b912c007a94cb87a
Component: engine
 2016-04-27 09:57:54 -07:00
Michael Holzheu
1fe350f74d Dockerfile.s390x: Add upstream libseccomp to compile runc 
The runc compile currently fails on s390x:

 Step 35 : RUN set -x    && export GOPATH="$(mktemp -d)" && git clone
 https://github.com/opencontainers/runc.git
 "$GOPATH/src/github.com/opencontainers/runc"       && cd
 "$GOPATH/src/github.com/opencontainers/runc"      && git checkout -q
 "$RUNC_COMMIT"  && make static BUILDTAGS="seccomp apparmor selinux"     &&
 cp runc /usr/local/bin/docker-runc

 [snip]

 # github.com/seccomp/libseccomp-golang
 Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp.go:25:22:
 fatal error: seccomp.h: No such file or directory
  // #include <seccomp.h>

The problem is that the installed libseccomp version in trusty is too old.

Fix this and install version 2.3.0 of libseccomp like it is done in the
x86 Dockerfile.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 97f45bd629fa3e5921c5a70f3e8087c1afbb07a6
Component: engine
 2016-04-27 18:57:15 +02:00
Hao Zhang
661a968ea5 update cgroup link in doc of run 
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
Upstream-commit: 8fec7c26d4e831481674bcab7a0539affc91da29
Component: engine
 2016-04-27 08:50:46 -04:00
Doug Davis
f770cdfb66 Remain extra \n on INFO log msg 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1e44bba4af6c417e10cbf7aa459a8225dfb89d6c
Component: engine
 2016-04-27 05:19:40 -07:00
Vincent Demeester
195b88ab8e Merge pull request #22137 from HackToday/addevents 
Add load/save image event support
Upstream-commit: d6176bb03add9c03b0ef83617648f34496713fe2
Component: engine
 2016-04-27 12:58:49 +02:00