Commit graph

18885 commits

Author SHA1 Message Date
Doug Davis
ba973f2d74 Remove used param on ParseHost
The first param on opts.ParseHost() wasn't being used for anything.

Once we get rid of that param we can then also clean-up some code
that calls ParseHost() because the param that was passed in wasn't
being used for anything else.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-10-11 20:45:17 -07:00
Sebastiaan van Stijn
c45ad0b02d Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376
Default the tcp port to 2376 if tls is on, and 2375 if not
2015-10-11 15:35:04 -07:00
Sebastiaan van Stijn
70edf41c06 Merge pull request #16764 from thaJeztah/follow-the-white-rabbit
Docs: add Docker version/API version matrix
2015-10-11 15:28:46 -07:00
Vincent Demeester
6e12d9fe62 Merge pull request #16865 from MHBauer/registry-service-refactor
refactor away direct references to daemon member
2015-10-11 21:47:58 +02:00
Sebastiaan van Stijn
3a24eb2de4 Merge pull request #16618 from abronan/fix_discovery_pkg_readme
Fix discovery package README with the right --cluster* flags
2015-10-11 12:05:07 -07:00
Sven Dowideit
ad9706a7c5 Merge pull request #16915 from moxiegirl/testing-hugo-15
Enabled GitHub Flavored Markdown
2015-10-12 03:52:11 +10:00
Mary Anthony
8fee1c2020 Enabled GitHub Flavored Markdown
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-11 07:49:54 -07:00
Vincent Demeester
fb8217ee62 Merge pull request #16889 from cxxly/16756-refactor-docker_cli_wait_test
use of checkers on Integration test
2015-10-11 10:12:42 +02:00
Xiaoxu Chen
19c30447b5 use of checkers on Integration test
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

update integration-cli/docker_cli_wait_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

update integration-cli/docker_cli_wait_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>

update docker_cli_wait_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-11 11:31:01 +08:00
Arnaud Porterie
ed9434c5bb Merge pull request #12648 from estesp/userns-impl
Phase 1 implementation of user namespaces as a remapped container root
2015-10-10 11:38:07 -07:00
Arnaud Porterie
ef4b053b90 Merge pull request #16907 from sdurrheimer/zsh-completion-cluster-store-opt
Add zsh completion for '--cluster-store-opt'
2015-10-10 10:32:08 -07:00
Vincent Demeester
ec05d93c16 Merge pull request #16800 from duglin/buildCache
Add useful info to builder cache logrus.Debug
2015-10-10 17:38:43 +02:00
Steve Durrheimer
ae31aa10ab Add zsh completion for '--cluster-store-opt'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-10 16:42:01 +02:00
Vincent Demeester
d46fff7d8f Merge pull request #16846 from HuKeping/master
Use checkers on Integration test when possible
2015-10-10 16:35:17 +02:00
Hu Keping
72269acf29 Use checkers on Integration test when possible
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-10 21:51:15 +08:00
Doug Davis
4920d40093 Add useful info to builder cache logrus.Debug
Closes: #16790

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-10-10 05:53:06 -07:00
Vincent Demeester
faa448e801 Merge pull request #16838 from ZJU-SEL/update-save-load-unix-test
update save-load-unix-test
2015-10-10 14:51:18 +02:00
Sebastiaan van Stijn
a6bbf16aa1 Merge pull request #16895 from vdemeester/ocd-validate-typo
Fix few comments in validate scripts
2015-10-10 12:08:37 +02:00
Sebastiaan van Stijn
5f2e0864e4 Merge pull request #16899 from jfrazelle/provide-dates
fix depreciation dates
2015-10-10 12:06:34 +02:00
Vincent Demeester
99c247a46a Merge pull request #16874 from ZJU-SEL/fix-parse-run-volumes
fix the error msg of func TestParseRunVolumes
2015-10-10 11:27:08 +02:00
Vincent Demeester
1ce9be346b Fix few comments in validate scripts
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-10 11:21:04 +02:00
xlgao-zju
8d98b37031 update save-load-unix-test
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
2015-10-10 15:16:42 +08:00
xlgao-zju
8363f2f171 fix the error msg of func TestParseRunVolumes
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
2015-10-10 14:56:50 +08:00
Jessica Frazelle
26701e2d9f
fix depreciation dates
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-09 20:24:04 -07:00
Phil Estes
bf80adeee4 Merge pull request #16894 from diogomonica/renaming-trust-keys
Renaming trust keys
2015-10-09 23:20:54 -04:00
Jess Frazelle
e5f7fdccfb Merge pull request #16788 from stefanberger/apparmor_policy_1.9
contrib: Adjustments to AppArmor docker engine policy for docker 1.9
2015-10-09 20:15:06 -07:00
Jessica Frazelle
930b27a86b fix logic because jess is the worst
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-09 22:21:24 -04:00
Phil Estes
a85e6a4d4a Update integration test userns support with flag name change
`--root` is now `--userns-remap`

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-09 20:52:45 -04:00
Jessica Frazelle
ea3afdad61 add test-integration-cli specifics for userns
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-09 20:50:27 -04:00
Phil Estes
44e1023a93 Add user namespace enable flag --userns-remap in experimental build
This adds the capability to turn on user namespace support when using an
experimental build Docker daemon binary using the `--userns-remap` flag.

Also documentation is added to the experimental docs.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-09 20:50:05 -04:00
Sven Dowideit
50f0906007 Default the tcp port to 2376 if tls is on, and 2375 if not
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-09 17:48:03 -07:00
Diogo Monica
d9a2fadb5e Changing docs to reflect new names
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-09 15:13:37 -07:00
Vincent Demeester
1e5165275f Merge pull request #16858 from cxxly/16756-refactor-docker_cli_login_test
refactor integration-cli/docker_cli_login_test.go with Assert
2015-10-09 23:56:24 +02:00
Phil Estes
442b45628e Add user namespace (mapping) support to the Docker engine
Adds support for the daemon to handle user namespace maps as a
per-daemon setting.

Support for handling uid/gid mapping is added to the builder,
archive/unarchive packages and functions, all graphdrivers (except
Windows), and the test suite is updated to handle user namespace daemon
rootgraph changes.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-09 17:47:37 -04:00
Phil Estes
9a3ab0358e Add utility/support package for user namespace support
The `pkg/idtools` package supports the creation of user(s) for
retrieving /etc/sub{u,g}id ranges and creation of the UID/GID mappings
provided to clone() to add support for user namespaces in Docker.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-09 17:44:47 -04:00
Morgan Bauer
215bfc73d2
refactor away direct references to daemon member
- add daemon methods Authenticate & SearchRegistryForImages
 - use new methods instead of directly accessing RegistryService

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-09 14:40:03 -07:00
Brian Goff
7787d6dc28 Merge pull request #16709 from MHBauer/daemon-derepo2
continue daemon refactor of Repositories()
2015-10-09 15:35:21 -04:00
Phil Estes
f112cd6b6e Merge pull request #16868 from cpuguy83/speedup_graph_unittests
Do not probe plugins for graph init unless `-s`
2015-10-09 15:31:09 -04:00
Diogo Monica
63f8db83aa Adding tests for backwards compatibility
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-09 12:20:19 -07:00
Diogo Monica
52240c2d62 Changed trust ENV variables while still supporting old ones
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-10-09 12:19:43 -07:00
Sebastiaan van Stijn
dbc20693f7 Merge pull request #16604 from mountkin/add-missing-commit-parameters
add missing parameters of the commit API to the docs
2015-10-09 20:55:54 +02:00
Sebastiaan van Stijn
5099255d87 Merge pull request #16722 from sallyom/man-docker-build-fix
add clarity in man/docker-build
2015-10-09 20:53:28 +02:00
Sally O'Malley
a2bc804936 add clarity/fix typos man/docker-build
add needed clarity for
1)  using STDIN to pass build context
2)  --cpu-shares flag use

also a few typos

Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-10-09 13:57:13 -04:00
Alexander Morozov
90e733f0b1 Merge pull request #16867 from dmcgowan/distribution-upstream-name-change
Update distribution package for name regexp change
2015-10-09 10:09:23 -07:00
Alexander Morozov
2491f6c95a Merge pull request #16877 from cxxly/16756-refactor-docker_hub_pull_suite_test
Use Assert statement to replace condition judgment
2015-10-09 09:57:14 -07:00
Alexander Morozov
a77d80d9d1 Merge pull request #16881 from cxxly/16756-refactor-docker_cli_stats_test
update integration-cli/docker_cli_stats_test.go use Assert statement
2015-10-09 09:55:41 -07:00
Alexander Morozov
dc04675f4a Merge pull request #16882 from albers/completion--cluster-store-opt
Add bash completion for `--cluster-store-opt` (#16644)
2015-10-09 09:53:56 -07:00
moxiegirl
26ee5fea02 Merge pull request #16287 from mikebrow/16055-man-update-for-docker-run-with-host-volumes
man update for docker run with host volumes
2015-10-09 09:24:11 -07:00
Brian Goff
3b16cb15b4 Do not probe plugins for graph init unless -s
When `-s` is not specified, there is no need to ask if there is a plugin
with the specified name.

This speeds up unit tests dramatically since they don't need to wait the
timeout period for each call to `graphdriver.New`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-09 12:02:54 -04:00
Brian Goff
96e1cda40f Merge pull request #16875 from hqhq/hq_quiet_at_info
Keep daemon quiet when using docker info
2015-10-09 11:26:53 -04:00