6540efb3d3
If an env var is passthrough but not defined on the host don't set it.
...
This doesn't change too much code and keeps the generators.
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
2016-01-23 15:58:06 -05:00
139c7f7830
Move named volumes matching to config validation phase
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-22 17:42:24 -08:00
48377a354f
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-22 16:05:21 -08:00
3a72edb906
Network fields schema validation
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-01-22 16:42:10 +02:00
35788f47ff
Merge pull request #2729 from shin-/bump_docker_py
...
Use latest docker-py rc
2016-01-22 11:40:35 +00:00
49c83b16c2
Merge pull request #2726 from aanand/no-logs-on-interactive-run
...
Pass logs=False to dockerpty
2016-01-22 11:37:58 +00:00
9e67eae311
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-21 18:10:53 -08:00
77b435f4fe
Use latest docker-py rc
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-21 18:07:14 -08:00
963ec1ceda
Merge pull request #2707 from dnephin/add_stop_signal_to_docs
...
Add stop signal to the docs
2016-01-21 18:41:28 -05:00
da2b6329ae
Add test for logs=False
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
compose/cli/main.py
2016-01-21 19:20:50 +00:00
6e73fb38ea
Fixes #2448
...
Signed-off-by: Alf Lervag <alf.lervag@bouvet.no>
Conflicts:
compose/cli/main.py
requirements.txt
2016-01-21 19:19:37 +00:00
8662ce8e21
Merge pull request #2723 from aanand/fix-run-with-networking
...
Fix 'run' behaviour with networks
2016-01-21 19:07:53 +00:00
730c33b28c
Merge pull request #2699 from aanand/update-compose-file-docs
...
Update Compose file documentation for version 2
2016-01-21 18:57:16 +00:00
fec8cc9f80
Update documentation for `external` param
...
Signed-off-by: Joffrey F <joffrey@docker.com>
Conflicts:
docs/compose-file.md
2016-01-21 18:51:28 +00:00
59493dd7aa
Add links to networks key references
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:51:28 +00:00
2f41f3aa7e
Update documentation for links
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:51:28 +00:00
9a3378930f
Document depends_on
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:50:44 +00:00
0554c6e6fd
Update Compose file documentation for version 2
...
- Explain each version in its own section
- Explain how to upgrade from version 1 to 2
- Note which keys are restricted to particular versions
- A few corrections to the docs for version-specific keys
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:50:44 +00:00
f3e55568d1
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-21 18:42:59 +00:00
09dbc7b4cb
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-21 18:04:50 +00:00
a14906fd35
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-21 17:28:55 +00:00
1e51b7e88b
Merge pull request #2722 from aanand/fix-scale-race-condition
...
Fix scale race condition
2016-01-21 17:08:15 +00:00
013c5ea3f9
Merge pull request #2713 from aanand/links-v2
...
Support links in v2 files
2016-01-21 17:08:05 +00:00
7a4fdfd034
Merge pull request #2712 from jzvelc/fix_v2_service_extend
...
Fix `extends` when using v2 config format
2016-01-21 17:06:21 +00:00
642e71b4c7
Stop and remove containers in parallel when scaling down
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 15:28:40 +00:00
755c49b500
Fix scale when containers exit immediately
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 15:19:55 +00:00
ee63075a34
Support links in v2 files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 14:34:26 +00:00
5a249bd9f5
Fix Windows build failures when installing dependencies from git
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 11:39:08 +00:00
907c3ce42b
Fix for extending services written in v2 format.
...
Signed-off-by: Jure Žvelc <jzvelc@gmail.com>
2016-01-20 18:46:16 +01:00
e35bf47a7f
Merge pull request #2708 from dnephin/implement_depends_on
...
Implement depends_on
2016-01-20 17:46:10 +00:00
fd6b7d1747
Merge pull request #2693 from dnephin/migrate_v1_to_v2
...
Add a migration script for v1 to v2 compose format
2016-01-20 17:45:01 +00:00
3b1a0e6fc9
Add stop signal to the docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 21:33:04 -05:00
5aadf5a187
Update tests in sort_services_test.py to use pytest.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 15:52:17 -05:00
146587643c
Move ulimits validation to validation.py and improve the error message.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 15:47:57 -05:00
0bce467782
Implement depends_on to define an order for services in the v2 format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 15:41:45 -05:00
85619842be
Add migration script.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 14:50:41 -05:00
c39489f540
Don't copy over volumes that were previously host volumes, and are now container volumes.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 14:41:21 -05:00
c47aea9c12
Merge pull request #2698 from aanand/fix-name-is-reserved
...
Fix "name is reserved" with Engine 1.10 RC1
2016-01-19 10:15:06 -05:00
1be147f775
Merge pull request #2696 from aanand/test-external-default
...
Test that you can set the default network to be external
2016-01-19 10:09:42 -05:00
2106481c23
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-19 11:27:27 +00:00
5b2b4cbb07
Merge pull request #2692 from aanand/fix-tls-paramater-error
...
Catch TLSParameterErrors from docker-py
2016-01-19 11:25:21 +00:00
746033ed9d
Test that you can set the default network to be external
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-19 10:57:12 +00:00
413cdbcb81
Merge pull request #2675 from sdurrheimer/zsh-completion-up-abort-on-container-exit
...
Add zsh completion for 'docker-compose up --abort-on-container-exit'
2016-01-19 10:41:08 +00:00
683c8b0067
Merge pull request #2676 from sdurrheimer/zsh-completion-down-command
...
Add zsh completion for 'docker-compose down'
2016-01-19 10:40:29 +00:00
9d2e1f58d9
Merge pull request #2677 from sdurrheimer/zsh-completion-fix-invalid-commands-cache
...
Fix zsh completion to ensure we have enough commands to store in the …
2016-01-19 10:40:03 +00:00
adedbee41b
Merge pull request #2694 from dnephin/release_script_fixes
...
Fix some bugs in release scripts
2016-01-19 10:39:06 +00:00
9ccef1ea91
Catch TLSParameterErrors from docker-py
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 21:48:12 +00:00
66dd9ae9a4
Fix some bugs in release scripts.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-18 15:59:40 -05:00
341fa58b21
Merge pull request #2690 from aanand/ipam-config
...
Allow custom ipam config
2016-01-18 19:44:07 +00:00
b863fe5723
Merge pull request #2687 from aanand/update-networking-docs
...
Update networking docs
2016-01-18 18:59:33 +00:00
jrabbit
Joffrey F
Dimitar Bonev
Aanand Prasad
Daniel Nephin
Alf Lervag
Jure Žvelc
Daniel Nephin