docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
2,604 Commits 92 Branches 28 Tags
722e3a2fc768d8ff463538759d564857025caab5
Commit Graph

626 Commits

Author SHA1 Message Date
Aanand Prasad
d99cad60e7 Bump 1.6.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 19:43:26 +00:00
Aanand Prasad
19ae76a442 Update docker-py and dockerpty 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 19:41:11 +00:00
Aanand Prasad
413a55aa71 Connect container to networks before starting it 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 14:43:11 +00:00
Dimitar Bonev
64336615cf Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-02-03 18:21:44 +00:00
Daniel Nephin
dc718eae65 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-03 18:21:44 +00:00
Daniel Nephin
aa5ff05463 Fix merging of lists with multiple files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:44 +00:00
Ryan Taylor Long
3b7471ae84 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-03 18:21:44 +00:00
Daniel Nephin
61d00ebee4 Extract volume init and removal from project. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
3b1276bd44 Include networks in the config_hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
3e8a4a5dc3 Don't initialize networks that aren't used by any services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Daniel Nephin
0c87e0b18f Refactor project network initlization. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-03 18:21:43 +00:00
Aanand Prasad
8024f2f09e Tweak and test warning shown when version is a dict 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:43 +00:00
Aanand Prasad
f081376067 Improve error messages for invalid versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
ce0d469c18 Make 'version' a string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
b2ee08f439 Remove redundant check - self.config should never be None 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-03 18:21:42 +00:00
Aanand Prasad
e9ba06ed4b 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-03 18:21:42 +00:00
Daniel Nephin
bbaae11a0f 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-02-01 15:51:16 +00:00
Daniel Nephin
24e71db345 Don't copy over volumes that were previously host volumes, and are now container volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-01 15:51:15 +00:00
Aanand Prasad
695c692be6 Bump 1.6.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 01:42:21 +00:00
Aanand Prasad
297d20f085 Remove ability to join bridge network + user-defined networks 
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 01:42:21 +00:00
Aanand Prasad
d765a3fb91 Add back external links in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-27 00:45:44 +00:00
Aanand Prasad
52e74ab7ad Rename 'net' to 'network mode' in various classes/methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Aanand Prasad
2b7306967b Implement network_mode in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Joffrey F
3f28472ebc Move named volumes matching to config validation phase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:23 +00:00
Joffrey F
3da25aa463 is_named_volume also tests for home paths ~ 
Fix bug with VolumeSpec not being updated
Fix integration test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:23 +00:00
Joffrey F
a66bf72199 Match named volumes in service definitions with declared volumes 
Raise ConfigurationError for undeclared named volumes
Test new behavior

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-26 11:52:23 +00:00
Aanand Prasad
883227c4d8 Alias containers by short id 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:23 +00:00
Dimitar Bonev
5545c55ecc Network fields schema validation 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-26 11:52:22 +00:00
Alf Lervag
833e16117e Fixes #2448 
Signed-off-by: Alf Lervag <alf.lervag@bouvet.no>

Conflicts:
	compose/cli/main.py
	requirements.txt
 2016-01-26 11:52:22 +00:00
Aanand Prasad
b1ebf5ce17 Fix interactive run with networking 
Make sure we connect the container to all required networks *after*
starting the container and *before* hijacking the terminal.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:22 +00:00
Aanand Prasad
836ec70979 Stop connecting to all networks on container creation 
This relies on an Engine behaviour which is a bug, not an intentional
feature - we have to connect to networks one at a time

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:22 +00:00
Aanand Prasad
6ca410fd6b Fix 'run' behaviour with networks 
- Test that one-off containers join all networks
- Don't set any aliases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:22 +00:00
Aanand Prasad
5cfd947f38 Stop and remove containers in parallel when scaling down 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad
513a6b35cc Fix scale when containers exit immediately 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Aanand Prasad
cbec6f8834 Support links in v2 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:21 +00:00
Jure Žvelc
c9ef1fa32f Fix for extending services written in v2 format. 
Signed-off-by: Jure Žvelc <jzvelc@gmail.com>
 2016-01-26 11:52:20 +00:00
Daniel Nephin
3f65bdcf46 Move ulimits validation to validation.py and improve the error message. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-26 11:52:20 +00:00
Daniel Nephin
6e5c312768 Implement depends_on to define an order for services in the v2 format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-26 11:52:20 +00:00
Aanand Prasad
bb377d3fe6 Fix "name is reserved" with Engine 1.10 RC1 
Ensure link aliases are unique (this deduping was previously performed
on the server).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:20 +00:00
Aanand Prasad
fbee4ce4b3 Catch TLSParameterErrors from docker-py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 11:52:20 +00:00
Daniel Nephin
d2556a1347 Bump 1.6.0-rc1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-18 14:50:56 -05:00
Aanand Prasad
237f134a00 Allow custom ipam config 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 14:50:56 -05:00
Aanand Prasad
64fc2b85cb Allow overriding of config for the default network 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 12:14:12 -05:00
Aanand Prasad
a22d248390 Quote network names in error messages 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 12:14:12 -05:00
Daniel Nephin
89e31f7a8d Validate that an extended config file has the same version as the base. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-15 18:12:56 -05:00
Aanand Prasad
cba75627e1 Fix error when joining host/bridge network 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:46:24 +00:00
Aanand Prasad
abd031cb3d Containers join each network aliased to their service's name 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:08:20 +00:00
Daniel Nephin
2a2eb81215 Merge pull request #2662 from dnephin/fix_config_printing_unicode 
Fix config printing unicode objects
 2016-01-14 19:26:39 -05:00
Daniel Nephin
1bfbba36b2 Ensure that the config output by config command never contains python objects. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 18:33:58 -05:00
Daniel Nephin
3021ee12fe Fix config command to print the new sections of the config 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 18:28:17 -05:00