tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,752 Commits 20 Branches 267 Tags 58 MiB
Commit Graph

740 Commits

Author SHA1 Message Date
Thomas Scholtes 5b6e02d13a 'run' command can use network aliases for service 
It is now possible for the 'run' command to use the network aliases
defined for the service.

Fixes #3492

Signed-off-by: Thomas Scholtes <thomas-scholtes@gmx.de>
 2018-02-27 13:13:50 -08:00
Joffrey F 9b2efd50f5
Merge pull request #5722 from docker/5700-call-docker-with-args 
Re-use TLS and host options when shelling out to docker CLI
 2018-02-27 12:27:49 -08:00
Joffrey F 7ce5766f6a Re-use TLS and host options when shelling out to docker CLI 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-27 11:14:28 -08:00
Joffrey F 2578813147
Merge pull request #5706 from docker/5601-config-proxy 
Use config file-provided proxy values to populate buildargs and env
 2018-02-27 10:13:37 -08:00
Joffrey F a35335a75c Add support for device_cgroup_rules in v2.3 files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-26 14:43:44 -08:00
Joffrey F a6c31b80fe Add support for seccomp files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-26 10:46:10 -08:00
Joffrey F ec0de7eb68
Merge pull request #5684 from docker/compat_mode 
Compatibility mode
 2018-02-26 10:42:59 -08:00
Joffrey F 5e4700b176 Add proxy_config tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-23 14:32:43 -08:00
Joffrey F d4106679a6 Use configfile-provided proxy values to populate buildargs and env values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-22 16:19:50 -08:00
Joffrey F c6fe564ed5 Add --detach tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-21 16:42:49 -08:00
Joffrey F cd7ccad81e Retrieve certs from default path if not provided explicitly 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-21 13:33:27 -08:00
Joffrey F 51076b5e12 Tests for compatibility mode 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-16 16:37:20 -08:00
Sorawis Nilparuk bb16d9e951 Add health string generator to match `docker ps` output 2018-02-12 12:10:05 -08:00
Joffrey F 3a0ed8cbba Modified options dict leads to a mismatched config hash for API < 1.30 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-06 16:58:15 -08:00
Joffrey F 9dde4fff0e Add support for 3.6 schema and tmpfs mount size 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-02 12:01:41 -08:00
Joffrey F a0f78539b6 Test and build on 3.6 (replaces 3.4) ; dist 3.6-compiled binaries 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-01 16:05:32 -08:00
Joffrey F 8725385813
Merge pull request #5631 from docker/bump_sdk 
Bump python SDK to 3.0.0
 2018-02-01 14:51:05 -08:00
Joffrey F 4d4e066fbc Fix DOCKER_TLS_VERIFY bug 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-01 12:16:32 -08:00
Joffrey F d8d484e0e1 Bump python SDK to 3.0.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-31 18:54:58 -08:00
Joffrey F f679f77555
Merge pull request #5598 from carlwgeorge/mock-import-fix 
Use mock compatibility import
 2018-01-23 09:55:13 -08:00
Carl George 8b5d32373e Use mock compatibility import 
`tests/__init__.py` already has a try/except statement to use mock from
the standard library when possible.  Take advantage of it like other
tests already do.

Signed-off-by: Carl George <carl@george.computer>
 2018-01-22 23:10:50 -06:00
Joffrey F b968d34227 Advanced merge for deploy dict in v3 files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-22 15:05:53 -08:00
Joffrey F fd1e8024f7
Merge pull request #5593 from docker/4651-tls-env-and-flags 
Support mixed use of TLS flags and TLS environment variables
 2018-01-22 11:01:44 -08:00
Joffrey F 593a675d2b Support mixed use of TLS flags and TLS environment variables 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-19 15:48:30 -08:00
Joffrey F 9ba9016cbc Improve ImageNotFound handling in convergence 
- Improved CLI prompt
- Attempt volume preservation with new image config
- Fix container.rename_to_tmp_name()
- Integration test replicates behavior ; remove obsolete unit test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-19 14:16:57 -08:00
Ian Glen Neal 4042121f6e The updated unit test simulates the error in the bug. What's happening 
is that the container has an image sha (represented by
    'shaDOES_NOT_EXIST') which causes an error when client.inspect_image
is called on it, because the image has actually been removed.

Signed-off-by: Ian Glen Neal <ian.gl.neal@gmail.com>
 2018-01-19 14:16:56 -08:00
Joffrey F 2d986dff79 Remove rebuild parameter ; set do_build instead 
Reduce repetition in main.py

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-19 14:16:56 -08:00
Ian Glen Neal 7591639c72 Fix #5465 by catching a no-image exception in 
get_container_data_volumes. The ImageNotFound exception is now bubbled
up to the client, which prompts the user on the desired course of action
(rebuild or abort). Added a case to the unit test to check that
an empty existing image doesn't result in an exception.

Closed old pull request #5466 because I did a rebase and it showed over
300 commits to merge, which I thought was messy.

Signed-off-by: Ian Glen Neal <ian.gl.neal@gmail.com>
 2018-01-19 14:16:56 -08:00
Joffrey F 5d4ccafd35
Merge pull request #5580 from docker/5578-use_cli_exec 
Use CLI for interactive exec on all platforms by default
 2018-01-19 14:15:07 -08:00
Joffrey F a5d8c68d42 Also use docker CLI for interactive one-off runs. 
COMPOSE_EXEC_NO_CLI -> COMPOSE_INTERACTIVE_NO_CLI

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-18 13:28:11 -08:00
Joffrey F 7f30a88bd6 Add type conversion (number, bool) -> float for label values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-17 18:50:27 -08:00
Joffrey F c387d05a40 Merge branch '4904-label-config-validation' of https://github.com/nginth/compose into nginth-4904-label-config-validation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-17 18:00:11 -08:00
Joffrey F 97da2cc6bb Add test for NoSuchService with unicode characters 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-12 13:57:40 -08:00
Joffrey F e174c3fd1c Revert -d/--timeout exclusion 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-11 12:37:46 -08:00
Joffrey F 39d535c1f5 Fix unicode errors in interpolation / serialization 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-09 17:05:12 -08:00
Joffrey F 1b39817172
Merge pull request #5531 from docker/5505-required-variables 
Support ${VAR:?err} syntax for mandatory variables
 2018-01-08 13:38:15 -08:00
Joffrey F e400c05de0 Support ${VAR:?err} syntax for mandatory variables 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-05 16:46:09 -08:00
Joffrey F c3b1bce42e
Merge pull request #5538 from docker/update_test_asserts 
Replace unittest-style asserts with pytest asserts
 2018-01-04 15:00:44 -08:00
Joffrey F b13ec16e11 Replace unittest-style asserts with pytest asserts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 14:38:28 -08:00
Joffrey F b97b76d24f
Merge pull request #5537 from docker/Rozelette-branch_limit_test 
Add configurable parallel operations limit
 2018-01-04 13:04:27 -08:00
Joffrey F f22a1b6a2e Merge branch '5360-add-runtime-support' of https://github.com/cuckoohello/compose into cuckoohello-5360-add-runtime-support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 12:33:39 -08:00
Joffrey F 8d3c7d4bce Clean up limit setting code and add reasonable input guards 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 12:16:46 -08:00
Joffrey F d582ae0009 Merge branch 'branch_limit_test' of https://github.com/Rozelette/compose into Rozelette-branch_limit_test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 11:32:38 -08:00
Joffrey F 2d064614ac Gracefully handle errors and provide helpful error message in type conversion 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-03 14:02:05 -08:00
Ashlie Martinez acf76c15a2 Allow parallel limit to be set in env file. 
Signed-off-by: Ashlie Martinez <ashmrtn@utexas.edu>
 2017-12-16 19:50:55 -06:00
Ashlie Martinez dc6b464751 Do not bleed env values outside of test. 
Signed-off-by: Ashlie Martinez <ashmrtn@utexas.edu>
 2017-12-16 08:51:02 -06:00
Joffrey F fffcc05a8e Add stop_grace_period to ALLOWED_KEYS 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-11 11:03:19 -08:00
Shea Rozmiarek 48166a79c7 Add COMPOSE_PARALLEL_LIMIT to restrict global number of parallel operations 
Signed-off-by: Shea Rozmiarek <uberpanzermensch@gmail.com>
 2017-12-10 07:02:10 -06:00
Joffrey F d0644bdff8 Handle non-ascii characters in npipe error handler 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-08 14:16:14 -08:00
Joffrey F 5c0a06475c Expand mount source when type == bind 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-07 14:10:56 -08:00