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
Victoria
67fcfbb90a Merge pull request #27 from londoncalling/kitematic-contrib-guide
Adding articles for Kitematic Contributors Guide
2015-11-23 18:35:31 -05:00
Stefan Berger
5cd6b3eca2 Adjust docker-default profile when docker daemon is confined
Adjust the docker-default profile for when the docker daemon is running in
AppArmor confinement. To enable 'docker kill' we need to allow the container
to receive kill signals from the daemon.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
2015-11-23 15:20:01 -08:00
Stefan Berger
6079d9d6a3 Policy extensions for user namespaces and docker exec
A few additions to the policy when running with user namespaces enabled
and when running 'docker exec'.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
2015-11-23 15:19:45 -08:00
Ying Li
6ebb1fc7a8 Just connect to mysql as root, rather than as dockerdemo user with password.
Signed-off-by: Ying Li <ying.li@docker.com>
2015-11-23 18:05:10 -05:00
Ying Li
dbcb56b3bf Renamed keystoremanager to certs, and KeyStoreManager to Manager.
Since it no longer depends upon KeyStore, nor does it manipulate keys
in any way.

Signed-off-by: Ying Li <ying.li@docker.com>
2015-11-23 17:19:26 -05:00
Alexander Morozov
18c9fe0cec Merge pull request #18175 from crosbymichael/arm-doc
Change and move ARM.md doc to project
2015-11-23 13:57:42 -08:00
Michael Crosby
ffd36a14e7 Move arm info to project/
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-11-23 13:54:17 -08:00
Michael Crosby
2ec186377e Remove scaleway info
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-11-23 13:53:54 -08:00
David Calavera
aa22191093 Merge pull request #17356 from HuKeping/warn-on-oom
Warning out when disalbe oom killer but not set the memory limit
2015-11-23 12:43:04 -08:00
Nathan LeClaire
3affe5ec25 Merge pull request #2391 from dgageot/update-dependencies-google
Update Google Driver dependencies
2015-11-23 12:15:19 -08:00
Nathan LeClaire
4f4f20fd4f Merge pull request #2394 from dgageot/update-digitalocean-deps
Update digital ocean driver dependencies
2015-11-23 11:33:29 -08:00
Aditi Rajagopal
5cfa13ae48 Checkers on integration-cli/docker_api_info_test
Applying #16756 to integration-cli/docker_api_info_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 14:28:41 -05:00
moxiegirl
8400fa1b1e Merge pull request #1371 from pwnall/image_docs
Document filter usage in image building
2015-11-23 10:58:52 -08:00
Jeffrey Morgan
4db8fe5c48 Remove after script for now
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-23 13:48:45 -05:00
Alexander Morozov
9687008378 Merge pull request #18104 from hypriot/17802-remove-journald-to-fix-dynbinary-build-on-ARM
remove journald to fix dynbinary build on ARM
2015-11-23 10:38:45 -08:00
Victor Costan
94d84a618c Document filter usage in image building.
Signed-off-by: Victor Costan <costan@gmail.com>
2015-11-23 13:36:05 -05:00
Tianon Gravi
05d1a5aed6 Merge pull request #18152 from rgl/master
mkimage-arch: remove the test container after run
2015-11-23 10:35:15 -08:00
Jeffrey Morgan
eeaf2d1f7a Run after script
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-23 13:33:55 -05:00
Daniel Nephin
533f33271a Move service sorting to config package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-23 13:33:00 -05:00
Daniel Nephin
effa9834a5 Remove unnecessary intermediate variables in get_container_host_config.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-23 13:33:00 -05:00
Daniel Nephin
dac75b07dc Move volume parsing to config.types module
This removes the last of the old service.ConfigError

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-23 13:33:00 -05:00
Daniel Nephin
efec2aae6c Fixes #2008 - re-use list_or_dict schema for all the types
At the same time, moves extra_hosts validation to the config module.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-23 13:31:58 -05:00
Daniel Nephin
12b82a20ff Move restart spec to the config.types module.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-23 13:31:58 -05:00
Daniel Nephin
068edfa313 Move parsing of volumes_from to the last step of config parsing.
Includes creating a new compose.config.types module for all the domain objects.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-23 13:31:58 -05:00
Daniel Nephin
c9ca5e86b0 Remove project name validation
project name is already normalized to a valid name before creating a service.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-23 13:30:54 -05:00
Alexander Morozov
804d2f73c8 Merge pull request #18080 from aditirajagopal/16756-docker_api_images_test
Checkers on integration-cli/docker_api_images_test
2015-11-23 10:21:52 -08:00
Richard Scothern
9c3c50faff Merge pull request #1198 from jonboulle/master
README: fix formatting of docker-registry link
2015-11-23 10:14:31 -08:00
Aanand Prasad
83ddec8df7 Merge pull request #2439 from solarce/sol-matrix-trusty-fix
Fixing matrix include so `os: linux` goes to trusty
2015-11-23 18:01:22 +00:00
Alexandre Beslic
3cc7a426e3 Merge pull request #1376 from bfirsh/fix-typo-in-docs
Fix first sentence in docs
2015-11-23 09:55:43 -08:00
Alexandre Beslic
62c5d4b47a Merge pull request #1392 from MHBauer/issue1367
add newline to event json to match docker
2015-11-23 09:54:00 -08:00
Aanand Prasad
665de9a494 Merge pull request #2436 from dnephin/reduce_cyclomatic_complexity
Reduce cyclomatic complexity
2015-11-23 17:51:54 +00:00
Sebastiaan van Stijn
86377e541d Merge pull request #18157 from Djelibeybi/master
Fix CHANGELOG.md
2015-11-23 18:42:38 +01:00
David Gageot
198ab07be0 Update digital ocean dependencies
Signed-off-by: David Gageot <david@gageot.net>
2015-11-23 18:14:58 +01:00
Jean-Laurent de Morlhon
480051c1f7 Merge pull request #2393 from afscrome/patch-1
Clarifying  description of hyperv-disk-size
2015-11-23 18:13:19 +01:00
James Turnbull
097bc4881f Merge pull request #18167 from duglin/FixTagHelp
Add more to tag's -f flag's help
2015-11-23 11:59:22 -05:00
James Turnbull
2bc792e3bb Merge pull request #18132 from WeiZhang555/api-changelog
Add API change to docs
2015-11-23 11:57:46 -05:00
Sebastiaan van Stijn
5017a5dd69 Merge pull request #18161 from duglin/Issue18017
Add some docs about build-arg's impact on the cache
2015-11-23 17:57:28 +01:00
Doug Davis
5bf4766fca Add some docs about build-arg's impact on the cache
Closes #18017

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-23 08:51:11 -08:00
David Gageot
865133aa40 Update Google Driver dependencies
Signed-off-by: David Gageot <david@gageot.net>
2015-11-23 17:47:17 +01:00
Alex Crome
9abe8d9848 Clarifying description of hyperv-disk-size
Making clear the value is a maximum for a dynamic disk not the actual size of a fixed size disk.

Signed-off-by: Alex Crome <afscrome@users.noreply.github.com>
2015-11-23 16:41:45 +00:00
Daniel Nephin
b4edf0c454 Move parallel_execute to a new module.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-23 11:34:48 -05:00
Jeffrey Morgan
d68f80ee6a Add tests to .travis.yml
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-23 11:04:19 -05:00
Jeffrey Morgan
99ee78906d Dont update
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-23 10:59:51 -05:00
Jeffrey Morgan
c87f44b6df Brew install nodejs
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-23 10:52:06 -05:00
Jeffrey Morgan
7348ce48e2 Remove linux env in travis ci
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-23 10:49:30 -05:00
Jeffrey Morgan
b88b9861a3 Add OS X build environment
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-11-23 10:45:55 -05:00
Aditi Rajagopal
463c53c715 Checkers on integration-cli/docker_api_images_test
Applying #16756 to integration-cli/docker_api_images_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 10:33:32 -05:00
Andrea Luzzardi
08502d37fa Merge pull request #1433 from flx42/flx42-patch-1
Fix typo in discovery documentation
2015-11-23 16:30:27 +01:00
David Gageot
2b55e22eed Merge pull request #2390 from jeanlaurent/xhyve-driver
Add xhyve driver
2015-11-23 16:28:59 +01:00
Doug Davis
a70079ea23 Add more to tag's -f flag's help
Was noticed in #9798

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-23 07:20:10 -08:00