1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
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
Riyaz Faizullabhoy
46a37c0fa7 Allow for password caching for delegation keys with non-delegation PEM names
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-05-02 10:28:54 -07: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
Riyaz Faizullabhoy
5659554801 Allow for configurable notary signer db name, actually check allowed backends on setup
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-05-02 10:11:01 -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
Nishant Totla
b69728a2c5 Merge pull request #2196 from allencloud/fix-typos
fix typos in test and other files
2016-05-01 16:54:33 -07:00
Sun Hongliang
6cd8a06c8f fix typos in test and other files
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-02 07:29:33 +08: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
Alexandre Beslic
2a722a4058 Merge pull request #2194 from allencloud/use-engineapi-to-replace-dockerclient
use engine-api to replace dockerclient
2016-04-30 15:43:08 -07:00
Sun Hongliang
eafd9d658d use engine-api to replace dockerclient
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-01 00:14:00 +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
kevinBlum
7a442c945d Added documentation pertaining to VT-X virtualization being enabled when installing Toolbox
Added info and links to check if VT-X is enabled and how to enable it.
Added info about potential other issues of Toolbox not running when installed before enabling VT-X
Documentation pertains to issues docker/toolbox#166 and docker/docker#16182
2016-04-29 20:13:59 -07:00
Ke Xu
8f4c947d42 grep text for per-driver options
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-04-30 11:17:01 +09:00
Dong Chen
92834d1fa1 Update stats test to stop connection
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-04-29 17:58:52 -07:00
Thom Linton
28fb91b344 Adds additional validation to 'env_vars_from_file'.
The 'env_file' directive and feature precludes the use of the name
'.env' in the path shared with 'docker-config.yml', regardless of
whether or not it is enabled.

This change adds an additional validation to allow the use of this
path provided it is not a file.

Signed-off-by: Thom Linton <thom.linton@gmail.com>
2016-04-29 17:53:31 -07:00
Joffrey F
c41f30c3ff Merge pull request #3385 from shin-/3316-skip-statusless-events
Skip event objects that don't contain a status field
2016-04-29 17:50:32 -07: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
Dongluo Chen
04b70bff15 Merge pull request #2154 from xianlubird/master
Fix the bug that start container mess the host config
2016-04-29 17:02:08 -07:00
Joffrey F
fe17e0f948 Skip event objects that don't contain a status field
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-29 16:39:42 -07:00
Joffrey F
bd7ec24e25 Merge pull request #3384 from shin-/3264-shorthand-host-support
Support combination of shorthand flag and equal sign for host option
2016-04-29 16:39:16 -07:00
Joffrey F
e4bb678875 Require latest docker-py version
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-29 16:37:26 -07:00
Derek McGowan
a1d7463d67 Merge pull request #1669 from RichardScothern/close-after-commit
Clean uploads
2016-04-29 16:18:29 -07:00
Sebastiaan van Stijn
31fe6179ab Merge pull request #2185 from SvenDowideit/use-docs-base-oss
convert docs Dockerfiles to use docs/base:oss
2016-04-30 01:05:26 +02: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
Aaron Lehmann
024a9ed6c7 Merge pull request #1681 from aaronlehmann/preserve-authors-schema1
Preserve author information in schema1 manifests
2016-04-29 14:40:24 -07:00
Troels Thomsen
3730470b64 Pass through known errors
Signed-off-by: Troels Thomsen <troels@thomsen.io>
2016-04-29 23:34:24 +02:00
Ying Li
134bdbcb90 Merge pull request #698 from docker/codecov.yml
Add a codecov config file that disables project and changes statuses
2016-04-29 14:24:01 -07: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