1
0
mirror of https://github.com/docker/docs.git synced 2026-11-06 12:54:24 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Srini Brahmaroutu
2046ba3e3c GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-10-26 19:09:00 +00:00
Victor Vieux
b924f7f8fa switch to go1.5.1
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-26 11:49:48 -07:00
Nathan LeClaire
ae973a96c0 Merge pull request #2088 from dgageot/fix-get-hostname
Fix get hostname
2015-10-26 11:35:05 -07:00
Sebastiaan van Stijn
74b9d89648 Merge pull request #17134 from sdurrheimer/zsh-completion-build-multi-tag
Add zsh completion for 'docker build' multi tags
2015-10-26 19:05:23 +01:00
David Gageot
6c5dc41e6d Revert "Remove useless duplication on GetSSHHostname"
This reverts commit b6462eb6d0.

Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 18:47:14 +01:00
David Gageot
57dc1156de Revert "Remove duplication over GetIP"
This reverts commit 99aacc7b79.

Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 18:47:03 +01:00
David Gageot
a7559fd3a8 Revert "Generic and Base slight cleanups"
This reverts commit 19625def22.

Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 18:46:54 +01:00
Alexandre Beslic
ae81ef652e Merge pull request #1338 from vieux/get_compiled_go
fix test Dockerfile, use precompiled go
2015-10-26 10:24:00 -07:00
Mazz Mosley
fe760a7b62 Include additional classifiers
I've included Python 2/3 as they are not parent classifiers but
sibling classifiers. They denote that this project will work with
*some* versions of python and by having them, they'll show up for
people searching for python 2 or 3 projects.

According to the internet :)

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-26 17:08:45 +00:00
Olivier Gambier
99b564e804 Merge pull request #2070 from dgageot/1985-build-with-docker-on-travis
FIX #1985 Build with Docker on TravisCI
2015-10-26 10:08:18 -07:00
Olivier Gambier
7ecb221444 Merge pull request #2083 from dgageot/remove-dead-code
Remove dead code
2015-10-26 10:07:27 -07:00
Alexander Morozov
34439f3ecb Merge pull request #17351 from mavenugo/predefined
Prevent user from deleting pre-defined networks
2015-10-26 10:06:45 -07:00
Daniel Nephin
88e53e177d Upgrade pyinstaller to 3.0
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-26 13:05:41 -04:00
Daniel Nephin
e168fd03ca Fix unicode in environment variables for python2.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-26 13:05:41 -04:00
Daniel Nephin
95a23eb682 Change version check from engine version to api version.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-26 13:05:40 -04:00
Daniel Nephin
f5ad363143 Use inspect network to query for an existing network.
And more tests for get_network()

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-26 13:05:40 -04:00
Tibor Vass
7e275cf0e5 Merge pull request #17333 from sdurrheimer/zsh-completion-fix-repeatable-options
Fix repeatable options in zsh completion
2015-10-26 12:43:21 -04:00
Ying Li
bcdd375ce5 Merge pull request #229 from cyli/tls-config-refactor
Factor out TLS configuration code for server and TLS
2015-10-26 09:33:41 -07:00
Ying Li
399df0a982 Merge pull request #234 from cyli/remove-symlinks
Remove symlinking root keys
2015-10-26 08:23:35 -07:00
Hu Keping
f410d7e70f Update docker_cli_build_unix_test
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-26 21:06:11 +08:00
Antonio Murdaca
9328fc7e62 Merge pull request #17222 from maaquib/16756-integration-cli-export-import-test
Using checkers assert for integration-cli/docker_cli_export_import_test.go
2015-10-26 13:58:21 +01:00
mnowster
f3d49e38c0 Merge pull request #2245 from dnephin/upgrade_to_pyinstaller_3
Upgrade to pyinstaller 3
2015-10-26 11:54:02 +00:00
David Gageot
2d1e6d0163 Simpler code for env usage hints.
We can just output the original os.Args in the
eval call.

Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 10:31:18 +01:00
Hu Keping
f8b9127181 Docs: update readme
Two main things:
- Update the content
- Update broken links

Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-26 16:42:20 +08:00
David Gageot
ab1b0ca2e9 Remove dead code
Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 09:35:12 +01:00
David Gageot
f155bc9df9 Merge pull request #2073 from nathanleclaire/fix_cert_env
Fix cert env
2015-10-26 09:31:26 +01:00
David Gageot
956b0bb65c FIX #1985 Build with Docker on TravisCI
Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 09:20:11 +01:00
Federico Gimenez
7058ec278d Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2015-10-26 09:09:38 +01:00
Carol Fager-Higgins
dbdff7a3da added openstack swift settings to config doc
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>
2015-10-25 23:37:07 -07:00
Hu Keping
3aa70c1948 Warning out when disalbe oom killer but not set the memory limit
It is always the best practice that only disable the OOM Killer where
you also set the `-m/--memory` option, otherwise it's dangerous.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-26 11:33:51 +08:00
liaoqingwei
d1ed5f62ad Use of checkers on docker_cli_config_test.go.
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-26 10:51:12 +08:00
Jian Zhang
f26a31e80c Use checker assert for integration-cli/docker_cli_cp_* four files.
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
2015-10-26 10:22:28 +08:00
weiyan
9120a1fc3e use of checkers on docker_cli_exec_test.go
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-26 10:01:48 +08:00
Brian Goff
75128c46c7 Merge pull request #17189 from maaquib/16756-integration-cli-unix-events-test
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
2015-10-25 20:39:32 -04:00
Madhu Venugopal
ead62b5952 Prevent user from deleting pre-defined networks
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-25 17:17:29 -07:00
Vincent Demeester
c71e97fc12 Merge pull request #17332 from askb/17225_flakytest_TestExecEnv
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
2015-10-25 21:17:50 +01:00
Doug Davis
029e7ae4e0 Merge pull request #17348 from askb/17243_flaykytest_TestExecAfterContainerRestart
Fix for #17243 DockerSuite.TestExecAfterContainerRestart.
2015-10-25 13:25:21 -04:00
Rusty Conover
5f2205981b Fix failing test case
When building a URL don't include path components in the host parameter.

Closes #1124

Signed-off-by: Rusty Conover <rusty@luckydinosaur.com>
2015-10-25 13:03:22 -04:00
Anil Belur
2a5f04dcc9 Fix for #17243 DockerSuite.TestExecAfterContainerRestart.
Added waitRun(containerID) statement after docker run -d and docker restart
to ensure the container is restarted before issuing a exec cmd.

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-10-25 21:43:31 +05:30
Sebastiaan van Stijn
5bcd6aba4b Merge pull request #17339 from moxiegirl/docs-readme-update
Tweaking some things
2015-10-25 16:45:04 +01:00
Tibor Vass
271f85afac Merge pull request #17325 from aboch/d0
Disable built-in SD on default bridge network
2015-10-25 11:04:27 -04:00
Federico Gimenez
e8da75d4a1 Integration test: bridge ip is excluded from the allocator pool
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2015-10-25 09:36:38 +01:00
moxiegirl
c10ef20ed8 Merge pull request #17319 from vdemeester/fix-network-help-inspect-syntax
Update docker network inspect help syntax
2015-10-24 21:56:38 -07:00
Mary Anthony
5560e8a61c Tweaking some things
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-24 18:07:08 -07:00
Anil Belur
6d974ec19d Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
This is done by calling waitRun() followed by the docker run, which ensures the container is loaded
before calling docker exec to obtain the env variable set previously.

Incorporated the change as suggeted by duglin.

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-10-24 22:54:24 +05:30
Dave Henderson
ee4a357441 Returning active host when swarm is active
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-24 12:47:49 -04:00
Steve Durrheimer
cc77fc3cb2 Add zsh completion for 'docker build' multi tags
+ Fix some others multi options

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-24 16:41:22 +02:00
Steve Durrheimer
7963807610 Fix repeatable options in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-24 16:38:41 +02:00
Brian Goff
80439a4ce2 Merge pull request #17296 from jecarey/16756-docker_cli_history_test
Use of checkers on docker_cli_history_test.go
2015-10-24 08:14:08 -04:00
Brian Goff
c3ea74f686 Merge pull request #17301 from sdurrheimer/zsh-completion-splunk-log-driver
Add splunk log driver to zsh completion
2015-10-24 08:00:12 -04:00