Commit Graph

23975 Commits

Author SHA1 Message Date
Daniel Nephin 8983d42988 Raise a more relevant error when dockerd is not available on the platform.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-02 11:59:25 -04:00
Daniel Nephin 9db86a38cd When exec'ing dockerd, look for it in the same directory as the docker binary first, before checking path.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-02 11:52:50 -04:00
Vincent Demeester 2a6980c5cb Merge pull request #22452 from cpuguy83/fix_zsh_completion_psformat
Make zsh completion work when ps output is custom
2016-05-02 17:39:46 +02:00
Brian Goff ba3f8a9fef
Make zsh completion work when ps output is custom
When `psFormat` is used in the docker client config json, if the output
is non-standard it breaks some of the completion handling for
containers.

This fixes that by ensuring that calls to `ps` use the default/standard
formatting by calling `docker ps --format 'table'`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-02 09:45:01 -04:00
Sebastiaan van Stijn b0a5762348 Merge pull request #22439 from sunyuan3/the
remove "the" in docs.
2016-05-01 13:50:41 +02:00
Yuan Sun 043c9ef076 remove "the" in docs.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2016-05-01 15:37:11 +08:00
Brian Goff e385faa35b Merge pull request #22434 from sdurrheimer/zsh-completion-network-ls-driver-filter
Add zsh completion for 'docker network ls -f driver'
2016-04-30 10:54:28 -04:00
Antonio Murdaca d32345240c Merge pull request #22282 from fntlnz/docs-authorization-plugins
Mention the fact that authz plugins are available today
2016-04-30 13:23:58 +02:00
Steve Durrheimer d6780c3190
Add zsh completion for 'docker network ls -f driver'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-04-30 13:07:03 +02:00
Vincent Demeester 7a56581297 Merge pull request #22319 from thaJeztah/network-driver-filter
Add "driver" filter for network ls
2016-04-30 10:38:10 +02:00
David Calavera 90dfb3dacc Merge pull request #22372 from dnephin/cli_cleanup
Reorganize client and cli packages
2016-04-29 17:31:39 -07:00
David Calavera b391a5914c Merge pull request #22426 from sdurrheimer/zsh-completion-network-ls-filters
Add zsh completion for 'docker network ls -f {id,name,type}'
2016-04-29 17:29:38 -07:00
Sebastiaan van Stijn cd41870132 Merge pull request #22241 from bfirsh/update-remote-api-client-libraries-page
Update remote API client libraries page
2016-04-30 00:39:29 +02:00
Alexander Morozov 5e58a583fc Merge pull request #22427 from tonistiigi/simplify-blkio
Simplify blkio resources setup in spec
2016-04-29 15:16:33 -07:00
Sebastiaan van Stijn e44a868bc4 Merge pull request #22406 from allencloud/fix-typos
fix typos in CHANGELOG.md and pull.go
2016-04-30 00:00:48 +02:00
Tonis Tiigi 668f0a2a4c Simplify blkio resources setup in spec
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-29 13:39:04 -07:00
Steve Durrheimer 8a51f9511c
Add zsh completion for 'docker network ls -f {id,name,type}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-04-29 22:38:10 +02:00
Doug Davis aa537a367c Merge pull request #22417 from michael-holzheu/s390x-dockerfile-add-registry-and-notary
Dockerfile.s390x: Build correct registries and notary client
2016-04-29 13:59:14 -04:00
John Howard f114ab21de Merge pull request #22340 from Microsoft/jstarks/split-service
Windows: Support running dockerd as a service
2016-04-29 10:47:20 -07:00
Vincent Demeester 9a58dd22f0 Merge pull request #22419 from cpuguy83/reflection_is_for_mirrors
Remove reflection on CLI init
2016-04-29 19:42:19 +02:00
Michael Holzheu 6e4c87c06e 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>
2016-04-29 19:24:49 +02:00
Brian Goff 5c8950e84d 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>
2016-04-29 11:57:46 -04:00
Sebastiaan van Stijn 55bc0a3440 Merge pull request #22418 from thaJeztah/update-event-api-docs
update API example response for docker events
2016-04-29 17:53:16 +02:00
Sebastiaan van Stijn 3932d46a78
update API example response for docker events
the events API was rewritten in 723be0a332,
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>
2016-04-29 17:37:04 +02:00
allencloud 1ac4c61c10 fix typos in CHANGELOG.md and pull.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-04-29 23:33:15 +08:00
Sebastiaan van Stijn 23e418b6c9
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>
2016-04-29 16:22:26 +02:00
Doug Davis 24a8de2b60 Merge pull request #22202 from michael-holzheu/s390x-add-libseccomp-2.3.0
Dockerfile.s390x: Add upstream libseccomp to compile runc
2016-04-29 08:13:13 -04:00
Brian Goff 717842fbde Merge pull request #22370 from mlaventure/fix-experimental-builder
Allow specifying the apt mirror to use when generating deb packages
2016-04-28 16:26:29 -04:00
Kenfe-Mickael Laventure d0a65a03e9 Allow specifying the apt mirror to use when generating deb packages
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-04-28 13:05:34 -07:00
Brian Goff ca611fdea2 Merge pull request #22388 from fy2462/exec-add-newline
Fix bug: exec non-exist command miss a "\n"
2016-04-28 11:30:28 -04:00
Brian Goff dbee44c9e0 Merge pull request #21613 from wzyboy/support-unixgram-syslog-address
Support unixgram syslog address
2016-04-28 11:06:17 -04:00
Sebastiaan van Stijn 0bb4c902e0 Merge pull request #22396 from sbellem/docs-typo-fix
Fix typo
2016-04-28 15:27:28 +02:00
Sylvain Bellemare 63aa03ce0a Fix typo
Signed-off-by: Sylvain Bellemare <sylvain@ascribe.io>
2016-04-28 15:15:08 +02:00
Brian Goff feb8f0e10e Merge pull request #22391 from thaJeztah/update-changelog-in-master
merge changelog for v1.11.1 into master
2016-04-28 09:11:25 -04:00
Sebastiaan van Stijn d37e22b623 Merge pull request #22320 from thaJeztah/docs-remove-duplicate-sentence
docs: remove duplicate line in "Understand the architecture"
2016-04-28 12:45:08 +02:00
Antonio Murdaca 09021d6841 Merge pull request #22344 from cpuguy83/seccomp_for_centos
centos:7/oraclelinux:7 now includes libseccomp 2.2.1
2016-04-28 12:26:22 +02:00
Kenfe-Mickael Laventure ca0c1becea
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>
2016-04-28 12:15:17 +02:00
Sebastiaan van Stijn bf7307558e Merge pull request #22269 from coolljt0725/skip
Skip TestBuildNotVerboseFailure if no network
2016-04-28 11:19:56 +02:00
fy2462 8bf5613c1a 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>
2016-04-28 16:39:00 +08:00
Vincent Demeester 78eb8a5fb9 Merge pull request #21641 from yongtang/21595-discrepancy-on-hostname-validation
API/CLI discrepancy on hostname validation (#21595).
2016-04-28 09:25:13 +02:00
Zhuoyun Wei 57fad95e43
Support unixgram syslog address
- Consider unixgram:// as a valid URL prefix
- Parse unixgram:// addresses
- Update docs

Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org>
2016-04-28 11:04:50 +08:00
Lei Jitang 9ab0aa4336 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>
2016-04-27 21:29:05 -04:00
Sebastiaan van Stijn deb6ea4702 Merge pull request #22362 from ZJU-SEL/update-doc
update cgroup link in doc of run
2016-04-28 00:48:47 +02:00
Alexander Morozov 1158c921ab Merge pull request #22361 from duglin/removeCR
Remain extra \n on INFO log msg
2016-04-27 12:05:10 -07:00
Daniel Nephin 01a34e43b3 Consolidate the files in client/
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-27 14:53:36 -04:00
Daniel Nephin 30e3620eae Refactor cliconfig so that the default constructor can exist in the package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-27 14:25:47 -04:00
Daniel Nephin 33c9edaf6c 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>
2016-04-27 14:25:47 -04:00
moxiegirl 861815a325 Merge pull request #22229 from riyazdf/notary-doc-update
Update DCT docs with 1.11 info, fix typos
2016-04-27 09:59:30 -07:00
Riyaz Faizullabhoy 77da3bcb72 Update DCT docs with 1.11 info, fix typos
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-27 09:57:54 -07:00
Michael Holzheu 97f45bd629 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>
2016-04-27 18:57:15 +02:00