Commit Graph

24153 Commits

Author SHA1 Message Date
Kenfe-Mickael Laventure 20e1b9593e Update build-deb to make correct use of DOCKER_BUILD_PKGS
An environment variable cannot directly be used as a bash array, this
patch loops through all the IFS separated value (which default to
space) instead.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-02 11:22:01 -07:00
Brian Goff 988f481643 Update engine-api
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-02 14:17:40 -04:00
Aaron Lehmann 2f6e3b0ba0 Merge pull request #22448 from twistlock/authorization_error_code
Fix authorization issue - when request is denied return forbbiden exist code (403).
2016-05-02 11:04:19 -07:00
Brian Goff ba6209f744 Merge pull request #22367 from dnephin/fix_dockerd_lookup_and_warn
Fix lookup of dockerd when called from outside of $PATH
2016-05-02 13:58:57 -04:00
Alexander Morozov a2eacff5c7 image/tarexport: fix error formatting
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-05-02 10:26:32 -07:00
Alexander Morozov 7bb23f7acc Merge pull request #22247 from vdemeester/22240-implicit-pull
Fix #22240 do not pull all the tags implicitely
2016-05-02 10:23:10 -07:00
Liron Levin 526abc00b1 Fix authorization issue - when request is denied return forbbiden exist code (403).
- Return 403 (forbidden) when request is denied in authorization flows
(including integration test)
- Fix #22428
- Close #22431

Signed-off-by: Liron Levin <liron@twistlock.com>
2016-05-02 19:14:48 +03:00
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
Shijiang Wei e6590b5fa2 vendor docker-py 7befe694bd21e3c54bb1d7825270ea4bd6864c13
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-05-02 23:04:04 +08:00
Shijiang Wei 1790980ec6 inherit the daemon log options when creating containers
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-05-02 23:04:04 +08:00
Damien Nadé 79490a6ad3 contrib/completion/bash/docker: _docker_docker: quoting __docker_to_extglob result to avoid failglob interference
Signed-off-by: Damien Nadé <github@livna.org>
2016-05-02 16:53:43 +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 f74b856e1a
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>
2016-05-02 10:27:07 +02:00
Sebastiaan van Stijn b2b82b952c
minor contributing.md cleanup
- added an  image-link to the contributors guide
- added a link to forums.docker.com
- removed link to the docker-user Google Group, which is no longer in use
- remove the "Issue Report Template", because we now have a template for this on GitHub
- remove reference to the old "Docker-DCO-1.1-Signed-off-by" sign-off
- changed some none-https links to https

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-01 20:18:09 +02:00
Vincent Demeester 54ebe42de9
Fix #22240 do not pull all the tags implicitely
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-01 14:46:04 +02: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
Vincent Demeester ba901bb062 Vendor engine-api with pull fixes
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-04-30 17:24:25 +02: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
Dan Walsh 3894773d6e We should always return the MountLabel
We need to have labels applied even if a container is running in privileged
mode.  On an tightly locked down SELinux system, this will cause running
without labels will cause SELinux to block privileged mode containers.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-04-30 05:46:56 -04: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
Kenfe-Mickael Laventure ce72473197 Reset RemovalInProgress flag on daemon restart
This flag can be set on disk if the daemon were to crash or error out
while trying to remove container in which case subsequent tries to
delete the container would all fail.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-04-29 14:06:27 -07: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
Lucas Chan 55d61e98ba Updated docker-info output and documentation
- [x] Update man page description
- [x] Update man page sample output to something more current

Tested with: `TESTFLAGS='-check.f DockerSuite.TestInfoEnsureSucceeds*'
make test-integration-cli`

Signed-off-by: Lucas Chan <lucas-github@lucaschan.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-29 16:45:43 +02: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
Brian Goff 2b6bc294fc When calling volume driver Mount, send opaque ID
This generates an ID string for calls to Mount/Unmount, allowing drivers
to differentiate between two callers of `Mount` and `Unmount`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-29 09:37:02 -04: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
Wen Cheng Ma 24ec73f754 Update the `docker daemon` to `dockerd` for document
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-04-29 09:06:02 +08: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