tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,581 Commits 25 Branches 265 Tags 68 MiB
Commit Graph

468 Commits

Author SHA1 Message Date
Daniel Nephin e04a12b5ca Increase minimum version for v3. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-07 11:16:40 -05:00
Yong Wen Chua 62f8b1402e Implement `userns_mode` HostConfig for services 
Fixes #3349

This allows the key `userns_mode` to be used in service definitions.
Since `userns_mode` requires API version > 1.23, this is only available
in 2.1 and 3.0 versions of compose file

Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2016-12-05 14:25:56 +08:00
Joffrey F 60d005b055 Improve robustness of a couple integration tests with occasional failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-24 13:58:45 -07:00
Joffrey F 14716bc2da Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master 2016-10-17 14:09:09 -07:00
Joffrey F a5c1e4b0cd Merge pull request #3991 from shin-/3906-isolation-config 
Add support for "isolation" in config
 2016-10-17 11:02:11 -07:00
dbdd bdcce13f4a add support for creating volume and network with label definition 
Signed-off-by: dbdd <wangtong2712@gmail.com>
 2016-10-12 10:35:14 +08:00
Joffrey F e5ded6ff9b Add support for enable_ipv6 in network definition. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-06 15:49:08 -07:00
Joffrey F dc8a39f70d Add support for "isolation" in config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 15:31:58 -07:00
Joffrey F f65f89ad8c Merge pull request #3653 from shin-/3637-link-local-ips 
Add support for link-local IPs in service.networks definition
 2016-09-22 11:58:29 -07:00
Joffrey F 66b395d950 Include docker-py link-local fix and improve integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-15 14:55:42 -07:00
Joffrey F fd254caa68 Add support for link-local IPs in service.networks definition 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-15 14:55:14 -07:00
George Lester dada36f732 Supported group_add 
Signed-off-by: George Lester <glester491@gmail.com>
 2016-09-11 23:10:49 -07:00
Jean-François Roche d824cb9b06 Add support for swappiness constraint 
Run a service using `docker run --memory-swappiness=0` (see
https://docs.docker.com/engine/reference/run/)

refs #2383

Signed-off-by: Jean-François Roche <jfroche@affinitic.be>
 2016-08-16 11:02:51 +02:00
Ian Campbell d6f70dddc7 Call the superclass tearDown in VolumeTest 
Currently it doesn't actually seem to make any practical difference that this
is missing, but it seems like good practice to do so anyway, to be robust
against future test case changes which might require cleanup done in the super
class.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-21 13:17:53 +01:00
Ian Campbell 3124fec01a tearDown tmp_volumes array itself in VolumeTest 
Each volume in the array holds a reference to a docker.client.Client object and
therefore a connection pool which leaves fds open once the test has completed.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-21 13:17:53 +01:00
Ian Campbell 5cdf30fc12 Teardown project and db in ResilienceTest 
These hold a reference to a docker.client.Client object and therefore a
connection pool which leaves fds open once the test has completed.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-21 13:17:53 +01:00
Ian Campbell 0483bcb472 delete DockerClientTestCase.client class attribute on tearDownClass 
This is a docker.client.Client and therefore contains a connection pool, so
each subclass of DockerClientTestCase can end up holding on to up to 10 Unix
socket file descriptors after the tests contained in the sub-class are
complete.

Before this by the end of a test run I was seeing ~100 open file descriptors,
~80 of which were Unix domain sockets. By cleaning these up only 15 Unix
sockets remain at the end (out of ~25 fds, the rest of which are the Python
interpretter, opened libraries etc).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-20 15:51:22 +01:00
Aanand Prasad d7db15ce94 Merge pull request #3364 from TomasTomecek/3355-detailed-error-messages 
service: detailed error messages for create and start
 2016-07-11 16:29:35 -04:00
Jonathan Giannuzzi 83f35e132b Add support for creating internal networks 
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
 2016-07-11 11:34:01 +02:00
Tomas Tomecek fea970dff3 service: detailed error messages for create and start 
Fixes: #3355

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-07-11 10:45:27 +02:00
Aanand Prasad 1e176b58c5 Merge pull request #3592 from stakodiak/fix-privilege-typo 
Fix a typo in a test's name.
 2016-07-06 15:22:05 -07:00
George Lester 6fe5d2b543 Implemented oom_score_adj 
Signed-off-by: George Lester <glester491@gmail.com>
 2016-07-05 23:43:32 -07:00
Jonathan Giannuzzi 3c77db709f Fix assertion that was always true 
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
 2016-06-20 14:48:45 +02:00
alex 68d73183eb Fix a typo in a test's name. 2016-06-13 23:36:34 -04:00
Milind Shakya 11a2eab549 Replace assertEquals with assertEqual since the former is getting deprecated soon. Also, fix pep8 E309. 
Signed-off-by: Milind Shakya <sh.milind@gmail.com>
 2016-06-02 16:35:23 -07:00
Joffrey F 842e372258 Eliminate duplicates when merging port mappings from config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-20 15:28:35 -07:00
Joffrey F 310b3d9441 Properly handle APIError failures in Project.up 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-02 13:42:05 -07:00
Daniel Nephin 56c6e29819 Unit test for skipping network disconnect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-15 16:28:59 -04:00
Daniel Nephin 83df95d511 Remove extra ensure_image_exists() which causes duplicate builds. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-08 15:21:12 -04:00
Daniel Nephin b33d7b3dd8 Prevent unnecessary inspection of containers when created from an inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-06 11:14:42 -04:00
Joffrey F 12ad3ff301 Injecting os.environ in Environment instance happens outside of init method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F b99037b4a6 Add support for DOCKER_* variables in .env file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F 1801f83bb8 Environment class cleanup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 5831b869e8 Update tests for new environment handling 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F c69d8a3bd2 Implement environment singleton to be accessed throughout the code 
Load and parse environment file from working dir

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Daniel Nephin 732531b722 Disable a test that is failing against 1.11.0rc1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-24 12:32:13 -04:00
Aanand Prasad aaa7b09369 Merge pull request #3181 from dnephin/fix_partial_change_test_failure 
Fix flaky partial_change state test
 2016-03-22 10:14:28 +00:00
Aanand Prasad a20b84e6d2 Merge pull request #3178 from aanand/2774-off-one-offs 
Remove one-off containers in `rm` and `down`
 2016-03-22 10:12:21 +00:00
Daniel Nephin 5c968f9e15 Fix flaky partial_change state test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-21 19:07:50 -04:00
Daniel Nephin be1476f24b Only allow tmpfs on v2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-21 14:41:28 -04:00
Joffrey F 5826a2147b Use enum to represent 3 possible states of the one_off filter 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-21 12:12:52 +00:00
Philip Walls 85c7d3e5ce Add support for docker run --tmpfs flag. 
Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
 2016-03-18 18:19:48 -04:00
Daniel Nephin 25cbc2aae9 Fix flaky network test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-18 18:19:16 -04:00
Joffrey F 20c29f7e47 Add flag to up/down to remove orphaned containers 
Add --remove-orphans to CLI reference docs
Add --remove-orphans to bash completion file
Test orphan warning and remove_orphan option in up

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-15 16:11:49 -07:00
Ilya Skriblovsky 5df774bd10 Fixed testing error handling by `up` 
Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
 2016-03-14 22:55:42 +03:00
Matt Daue ee136446a2 Fix #2804: Add ipv4 and ipv6 static addressing 
- Added ipv4_network and ipv6_network to the networks section in the
  service section for each configured network
- Added feature documentation
- Added unit tests

Signed-off-by: Matt Daue <mattdaue@gmail.com>
 2016-03-09 18:37:52 -05:00
Joffrey F d2b065e615 Don't raise ConfigurationError for volume driver mismatch 
when driver is unspecified

Add testcase

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-07 18:07:41 -08:00
Aanand Prasad 2c75a8fdf5 Extract helper methods for building config objects from dicts 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 15:09:48 -08:00
Jesus 6bfb23baaa Display containers name when scale a container 
Display in the log output the name of those containers created using the scale command and
change the test_scale_with_api_error test to support the containers name when scale

Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
 2016-02-29 20:19:03 +01:00
Aanand Prasad adb8de367e Merge pull request #2388 from dnephin/fix_long_lines 
Wrap long lines
 2016-02-25 16:52:33 -08:00
Daniel Nephin 43ecf8793a Address old TODO, and small refactor of container name logic in service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:19:38 -08:00
Daniel Nephin d451578152 Make environment variables without a value the same as docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:14:59 -08:00
Daniel Nephin 4b04280db8 Revert "Change special case from '_', None to ()" 
This reverts commit 677c50650c.

Revert "Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior"

This reverts commit 0019037712.

Revert "Mangle the tests. They pass for better or worse!"

This reverts commit 7ab9509ce6.

Revert "If an env var is passthrough but not defined on the host don't set it."

This reverts commit 6540efb3d3.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:13:57 -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
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 740329a131 Shm_size requires docker 1.10. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-11 13:50:23 -05: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
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 57fc85b457 Wrap long lines and restrict lines to 105 characters. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-04 19:05:39 -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
Aanand Prasad aeef61fcd8 Make 'version' a string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-02 13:58:34 +00:00
Daniel Nephin 883e45626f Merge pull request #2706 from dnephin/dont_copy_host_volumes 
Don't copy host volumes on recreate
 2016-01-28 15:02:53 -05:00
Aanand Prasad ed1b204804 Rename 'net' to 'network mode' in various classes/methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 23:55:20 +00:00
Aanand Prasad e566a4dc1c Implement network_mode in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 23:24:55 +00:00
Aanand Prasad a267d8fe3c Merge pull request #2728 from shin-/2709_service_volumes 
Match named volumes in service definitions with declared volumes
 2016-01-25 23:24:09 +00:00
jrabbit 0019037712 Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2016-01-24 15:25:06 -05:00
Joffrey F 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
Joffrey F 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
Aanand Prasad 755c49b500 Fix scale when containers exit immediately 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 15:19:55 +00:00
Daniel Nephin 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
Aanand Prasad 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
Aanand Prasad afae365050 Allow custom ipam config 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-18 18:56:18 +00:00
Aanand Prasad 4772815491 Disable tests until Engine 1.10 change has been worked around 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:46:24 +00:00
Aanand Prasad 406b6b28f4 Tag v2-only tests 
- Don't run them against Engine < 1.10
- Set the API version appropriately for the Engine version, so all tests
  use API version 1.22 against Engine 1.10

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-15 02:08:20 +00:00
Garrett Heel 9cfa71ceee Add support for build arguments 
Allows 'build' configuration option to be specified as an
object and adds support for build args.

Signed-off-by: Garrett Heel <garrettheel@gmail.com>
 2016-01-14 12:14:56 -08:00
Aanand Prasad 3eafdbb01b Connect services to networks with the 'networks' key 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:37 +00:00
Aanand Prasad 69ed5f9c48 Specify networks in Compose file 
There's not yet a proper way for services to join networks

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:36 +00:00
Aanand Prasad 8fca4f1628 Merge pull request #2649 from dnephin/make_volumes_from_more_explicit 
Make volumes from more explicit in V2 config format
 2016-01-14 17:15:27 +00:00
Daniel Nephin b76dc1e05e Require volumes_from a container to be explicit in V2 config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:45:16 -05:00
Daniel Nephin c64af0a459 Add an acceptance test and docs for the down subcommand 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:11:08 -05:00
Aanand Prasad 7733600262 Merge pull request #2508 from jstewmon/stop_signal 
add support for stop_signal to compose file
 2016-01-14 12:46:04 +00:00
Joffrey F d601199eb5 Normalize external_name 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 12:07:08 -08:00
Joffrey F f774422d18 Test Volume.exists() behavior 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:58:24 -08:00
Joffrey F 9cb58b796e Implement ability to specify external volumes 
External volumes are created and managed by the user.
They are not namespaced.
They are expected to exist at the beginning of the up phase.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:53:49 -08:00
Joffrey F 05935b5e54 Don't recreate pre-existing volumes. 
During the initialize_volumes phase, if a volume using the
non-namespaced name already exists, don't create the namespaced
equivalent.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 15:42:42 -08:00
Jonathan Stewmon 5d8c2d3cec add support for stop_signal to compose file 
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
 2016-01-12 17:21:49 -06:00
Aanand Prasad a027a0079c Use networking for version 2 Compose files 
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:40 +00:00
Aanand Prasad 1a66543461 Make the default network name '{project name}_default' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Aanand Prasad b786b47bc8 Remove version checks from tests requiring API v1.21 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Daniel Nephin e98ab0e534 Allow both image and build together. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 14:10:00 -05:00
Joffrey F ca634649bb Changed logging override test into integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-11 16:25:19 -08:00
Dimitar Bonev ed5f7bd394 log_driver and log_opt moved to logging key. 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-08 01:54:45 +02:00
Daniel Nephin bf1552da79 Use json to encode invalid values in configuration errors so that the user sees a proper repr of the value. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:24 -05:00
Daniel Nephin 475a091768 Update pre-commit config to enforace that future imports exist in all files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:03 -05:00
Joffrey F a7689f3da8 Handle volume driver change error in config. 
Assume version=1 if file is empty in get_config_version
Empty files are invalid anyway, so this simplifies the algorithm
somewhat.
https://github.com/docker/compose/pull/2421#discussion_r47223144

Don't leak version considerations in interpolation/service validation

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:22:13 -08:00
Joffrey F f3a9533dc0 version no longer optional arg for process_config_file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:54 -08:00
Joffrey F ec5111f1c2 Volumes are now prefixed with the project name 
When created through the compose file, volumes are prefixed
with the name of the project they belong to + underscore,
similarly to how containers are currently handled.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Joffrey F ecef5d37a7 Add v2 configuration tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Joffrey F b4be7b870f Add support for declaring named volumes in compose files 
* Bump default API version to 1.21 (required for named volume management)
* Introduce new, versioned compose file format while maintaining support
  for current (legacy) format
* Test updates to reflect changes made to the internal API

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin 4bf2f8c4f9 Fix lookup of linked containers for API version 1.20 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin 97fe2ee40c Don't preserve host volumes on container recreate. 
Fixes a regression after the API changed to use Mounts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin c64b7cbb10 Ignore errors from API about not being able to kill a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Joffrey F 3bdcc9d954 Update service tests to use mounts instead of volumes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin 73de81b51c Upgrade tests to use new Mounts in container inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Aanand Prasad a2d2915a64 Merge pull request #2547 from seguins/1125-docker-compose-create 
Add docker-compose create command.
 2015-12-21 14:20:56 +00:00
Stéphane Seguin 3c76d5a467 Add docker-compose create command. 
Closes #1125

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-18 08:53:26 +01:00
Dimitar Bonev a542041264 Added support for cpu_quota flag 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2015-12-16 21:25:30 +02:00
Stéphane Seguin 999d15b225 Remove unused functions in service 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-08 21:11:05 +01:00
Daniel Nephin a21f9993b3 Remove migrate-to-labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 12:04:45 -05:00
Daniel Nephin 2ab3cb212a Add integration test and docs for build with a git url. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-26 11:32:39 -05:00
Daniel Nephin e67bc2569c Properly resolve environment from all sources. 
Split env resolving into two phases. The first phase is to expand the paths
of env_files, which is done before merging extends. Once all files are merged
together, the final phase is to read the env_files and use them as the base
for environment variables.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-25 11:02:20 -05:00
Aanand Prasad cfb1b37da2 Merge pull request #2405 from dnephin/move_all_validation_to_config 
Move all validation to config
 2015-11-25 15:16:21 +00:00
Aanand Prasad 88e9c1ccd9 Merge pull request #2438 from dnephin/fix_flaky_pull_test 
Fix `build --pull` test flakes
 2015-11-24 16:44:53 +00: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 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
Aanand Prasad 665de9a494 Merge pull request #2436 from dnephin/reduce_cyclomatic_complexity 
Reduce cyclomatic complexity
 2015-11-23 17:51:54 +00:00
Daniel Nephin 2351e11cc8 Make sure we always have the latest busybox image, so that build --pull tests don't flake. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-20 17:51:36 -05:00
Daniel Nephin d1adbb9b25 Refactor parallel_execute. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-20 17:09:51 -05:00
Daniel Nephin 1e8f76767f Fix env_file and environment when used with extends. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-18 16:07:11 -05:00
Daniel Nephin a746d673b1 Merge pull request #2350 from dnephin/remove_name_from_schema 
Remove name field from the config schema
 2015-11-11 15:43:03 -05:00
Daniel Nephin 76f3c9c739 Merge pull request #2349 from dnephin/validate_all_files 
Validate all files before merging them
 2015-11-11 15:27:47 -05:00
Aanand Prasad 2063b39868 Merge pull request #2336 from dnephin/warn_on_volume_masking 
Add a warning when the host volume in the compose file is masked by a data volume
 2015-11-11 17:21:29 +00:00
Daniel Nephin 1f7faadc77 Remove name from config schema. 
Refactors config validation of a service to use a ServiceConfig data object.
Instead of passing around a bunch of related scalars, we can use the
ServiceConfig object as a parameter to most of the service validation functions.

This allows for a fix to the config schema, where the name is a field in the
schema, but not actually in the configuration. My passing the name around as
part of the ServiceConfig object, we don't need to add it to the config options.
Fixes #2299

validate_against_service_schema() is moved from a conditional branch in
ServiceExtendsResolver() to happen as one of the last steps after all
configuration is merged. This schema only contains constraints which only need
to be true at the very end of merging.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-11 11:00:11 -05:00
Daniel Nephin a92d86308f Rename ServiceLoader to ServiceExtendsResolver 
ServiceLoader has evolved to be not really all that related to "loading" a
service. It's responsibility is more to do with handling the `extends`
field, which is only part of loading.  The class and its primary method
(make_service_dict()) were renamed to better reflect their responsibility.

As part of that change process_container_options() was removed from
make_service_dict() and renamed to process_service().  It contains logic for
handling the non-extends options.

This change allows us to remove the hacks from testcase.py and only call
the functions we need to format a service dict correctly for integration tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-11 10:58:07 -05:00
Daniel Nephin a8ac6e6f93 Add a warning when the host volume config is being ignored. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 13:48:53 -05:00
Daniel Nephin 45724fc667 Only create the default network if at least one service needs it. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 12:43:55 -05:00
Daniel Nephin 3474bb6cf5 Cleanup workaround in testcase.py 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 12:43:55 -05:00
Daniel Nephin 7c2a16234f Recreate dependents when a dependency is created (not just when it's recreated). 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-06 12:29:52 -05:00
Daniel Nephin 8ff960afd1 Fix service recreate when image changes to build. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:27:11 -05:00
Daniel Nephin ce322047a0 Move config hash tests to service_test.py 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:27:11 -05:00
Daniel Nephin 3d9e3d0877 Remove service.start_container() 
It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 10:17:09 -05:00
Daniel Nephin 45635f7097 Move cli tests to a new testing package. 
These cli tests are now a different kind of that that run the compose binary. They are not the same as integration tests that test some internal interface.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 19:28:58 -05:00
Daniel Nephin 8057bb3fcc Update cli tests to use subprocess. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 17:35:00 -05:00
Daniel Nephin 1b5b407619 Fix networking tests to work with new API in engine rc4 (https://github.com/docker/docker/pull/17536) 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 13:40:56 -05:00
Joffrey F 072e7687ae Integration test for run command with networking enabled 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-30 14:15:47 +01:00
Daniel Nephin a71d9af522 Disable a test against docker 1.8.3 because it fails due to a bug in docker engine. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 17:54:38 -04:00
Mazz Mosley bee063c07d Fix tests 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Mazz Mosley 7603ebea9b Attach to a container's log_stream before they're started 
So we're not displaying output of all previous logs for a container, we attach,
if possible, to a container before the container is started.

LogPrinter checks if a container has a log_stream already attached and
print from that rather than always attempting to attach one itself.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Daniel Nephin f7100b2ef3 Change version check from engine version to api version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 15:40:50 -04:00
Daniel Nephin 0fed5e6864 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-21 13:05:14 -04:00
Daniel Nephin e2f792c4f4 If -x-networking is used, set the correct API version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 12:09:50 -04:00
Aanand Prasad d5f5eb1924 Enable use of Docker networking with the --x-networking flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-14 11:19:43 -04:00
Aanand Prasad 627f1acdc4 Merge pull request #2126 from mnowster/1188-support-ro-options-in-volumes-from 
1188 support ro options in volumes from
 2015-10-07 11:57:14 +01:00
Mazz Mosley 467c731869 address PR feedback 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Vincent Demeester 5b55a08846 Add support for ro option in volumes_from 
Fixes #1188

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-06 13:12:55 +01:00