centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-01 00:38:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,502 Commits 54 Branches 28 Tags
bed0cfeb32f0769e2fd78be5a48e6ab2db60bf13
Commit Graph

668 Commits

Author SHA1 Message Date
Joffrey F
0cb8ba3775 Use modern set notation in _get_aliases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:28:12 -08:00
Joffrey F
7152f7ea76 Handle mismatched network formats in config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:24:41 -08:00
Joffrey F
825a0941f0 Network aliases are now part of the network dictionary 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00
Joffrey F
41e399be98 Fix network list serialization in py3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00
Joffrey F
633e349ab9 Test network_aliases feature 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:46 -08:00
Joffrey F
2b5d3f51cb Allow user to specify custom network aliases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:46 -08:00
Joffrey F
d3a95c2892 Merge pull request #2938 from shin-/2927-buildargs-types 
Constraint build argument types. Numbers are cast into strings.
 2016-02-18 15:07:09 -08:00
Joffrey F
93a02e497d Apply driver_opts processing to network configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 10:53:40 -08:00
Daniel Nephin
4f7530c480 Only set a container affinity if there are volumes to copy over. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-17 22:35:14 -05:00
Joffrey F
1952b52392 Constraint build argument types. Numbers are cast into strings 
Numerical driver_opts are also valid and typecast into strings.
Additional config tests.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-17 11:53:29 -08:00
Daniel Nephin
4a09da43ea Fix copying of volumes by using the name of the volume instead of the host path. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-17 13:34:14 -05:00
Daniel Nephin
74dc1b1411 Merge pull request #2893 from shin-/2833-run-dependencies 
Bring up all dependencies when running a single service.
 2016-02-12 16:33:01 -05:00
Joffrey F
a8fda480e3 driver_opts can only be of type string 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-12 10:51:11 -08:00
Joffrey F
367fabdbfa Bring up all dependencies when running a single service. 
Added test for running a depends_on service

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-12 09:46:10 -08:00
Joffrey F
e1d67ad68a Merge pull request #2882 from shin-/2715-old-server-error 
Detailed error message when daemon version is too old.
 2016-02-11 16:03:20 -08:00
Daniel Nephin
b6812b8600 Merge pull request #2877 from dnephin/fix_merging_build 
Fix build section without context
 2016-02-11 18:53:23 -05:00
Joffrey F
79f993f52c Detailed error message when daemon version is too old. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-11 15:20:32 -08:00
Joffrey F
e225f12551 Add logging when initializing a volume. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-11 11:40:22 -08:00
Daniel Nephin
532dffd688 Fix build section without context. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-11 14:12:02 -05:00
Aanand Prasad
23ab2c7e44 Merge pull request #2878 from dnephin/merge_build_args 
Merge build.args when merging services
 2016-02-11 17:41:41 +00:00
Spencer Rinehart
ab40d389d0 Fix sorting of DOCKER_START_KEYS. 
Make sure it's sorted!

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
 2016-02-10 15:25:18 -06:00
Spencer Rinehart
5e6dc3521c Add support for shm_size. Fixes #2823. 
shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22).  This requires docker-py 1.8.0
(docker/docker-py#923).

Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).

Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
 2016-02-10 15:25:18 -06:00
Daniel Nephin
37564a73c3 Merge build.args when merging services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-10 13:54:40 -05:00
Aanand Prasad
7b5bad6050 Merge pull request #2851 from cr7pt0gr4ph7/2839-fix-networks-merging 
Fix merge behavior for 'networks' and 'network_mode'.
 2016-02-10 17:51:01 +00:00
Daniel Nephin
6f06b3bd30 Merge pull request #2853 from dnephin/fix_short_id_alias 
Use 12 characters for the short id
 2016-02-09 14:56:24 -05:00
Joffrey F
fdf4a2e89e Merge pull request #2734 from jrabbit/empty-env-var-2359 
Empty env var #2359
 2016-02-08 11:17:54 -08:00
Daniel Nephin
421981e7d2 Use 12 characters for the short id to match docker and fix backwards compatibility. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-08 12:18:48 -05:00
Lukas Waslowski
5bd88f634f Handle the 'network_mode' key when merging multiple compose files. 
Fixes docker/compose#2840.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-08 15:33:26 +01:00
Lukas Waslowski
5a3a10d43b Correctly merge the 'services/<service>/networks' key in the case of multiple compose files. 
Fixes docker/compose#2839.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
 2016-02-08 15:17:21 +01:00
jrabbit
677c50650c Change special case from '_', None to () 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-02-06 02:54:06 -05:00
Aanand Prasad
869e815213 Bump 1.7.0dev 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 23:46:41 +00:00
Aanand Prasad
be236d8801 Update docker-py and dockerpty 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 19:16:01 +00:00
Daniel Nephin
80d02e84e2 Merge pull request #2808 from aanand/connect-before-start 
Connect container to networks before starting it
 2016-02-03 23:49:56 -05:00
Daniel Nephin
89c5b800e6 Merge pull request #2782 from dbonev/2772-compose-project-name-empty 
Falling back to default project name on empty COMPOSE_PROJECT_NAME
 2016-02-02 20:37:38 -05:00
Aanand Prasad
2651c00f0c Connect container to networks before starting it 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 19:31:49 +00:00
Daniel Nephin
4c4e94bc19 Merge pull request #2785 from dnephin/depends_on_with_extends 
Fix list options when used with extends and multiple files
 2016-02-02 13:36:46 -05:00
Daniel Nephin
3d3388d59b Extract volume init and removal from project. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:53:04 -05:00
Daniel Nephin
e551988616 Include networks in the config_hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:52:03 -05:00
Daniel Nephin
0810eeba10 Don't initialize networks that aren't used by any services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:52:03 -05:00
Daniel Nephin
8e838968fe Refactor project network initlization. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:51:31 -05:00
Daniel Nephin
e32863f89e Make links unique-by-alias when merging 
Factor out MergeDict from merge_service_dicts to reduce complexity below limit.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:48:47 -05:00
Daniel Nephin
bf6a5d3e49 Fix merging of lists with multiple files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:48:18 -05:00
Ryan Taylor Long
c70c72f49a Add depends_on to ALLOWED_KEYS 
This ensures and already existing `depends_on` is not deleted when the service on which it is defined also employs `extends`.

Signed-off-by: Ryan Taylor Long <ryan@rtlong.com>
 2016-02-02 10:48:18 -05:00
Aanand Prasad
1152c5b25b Tweak and test warning shown when version is a dict 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:58:34 +00:00
Aanand Prasad
ef8db3650a Improve error messages for invalid versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:58:34 +00:00
Aanand Prasad
aeef61fcd8 Make 'version' a string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:58:34 +00:00
Aanand Prasad
a8de582425 Remove redundant check - self.config should never be None 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:47:44 +00:00
Aanand Prasad
4ac004059a Normalise/fix config field designators in validation messages 
- Instead of "Service 'web' configuration key 'image'", just say
  "web.image"

- Fix the "Service 'services'" bug in the v2 file format

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:47:43 +00:00
Dimitar Bonev
34ccb90d7e Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-30 10:14:45 +02:00
Daniel Nephin
b4868d0259 Fix race condition with up and setting signal handlers. 
Also print stdout on wait_for_container().

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-29 13:04:04 -05:00