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 25 Branches 262 Tags 66 MiB
Commit Graph

1254 Commits

Author SHA1 Message Date
Matthieu Nottale 31dcfcff2a Revamp ParallelStreamWriter to fix display issues. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-07 15:22:38 +01:00
Joffrey F 38f7fdfe89
Merge pull request #5709 from mnottale/exec-workdir 
Add '--workdir' option to 'exec'.
 2018-03-02 15:28:07 -08:00
Joffrey F 4ceeaad089
Merge pull request #5725 from docker/geigerzaehler-run-with-network-alias 
Add --use-aliases flag to run command
 2018-02-27 14:01:09 -08:00
Joffrey F 1096a903be unset entrypoint test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-27 13:25:52 -08:00
Jim Dalton e78c0bf533 Add acceptance test for use-aliases feature 
Signed-off-by: Jim Dalton <jim.dalton@gmail.com>
 2018-02-27 13:13:50 -08:00
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
Matthieu Nottale 2fed399881 Add '--workdir' option to 'exec'. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-02-23 16:57:23 +01:00
Matthieu Nottale 59b08c7d1d New --log-level option. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-02-23 13:14:26 +01: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 2fa201660c
Merge pull request #5699 from docker/pantuza-cli-add-detach-option 
Add long-form --detach CLI flag
 2018-02-22 12:52:28 -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 8e268afc93 Add version guard for multi-service buildarg 
Add buildarg tests

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-21 15:56:02 -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
kcboschert 64b466c0bc Add optional argument to pull dependencies on docker-compose pull. 
Signed-off-by: Kevin Boschert <kcboschert@gmail.com>
 2018-02-14 13:11:01 -08:00
Sorawis Nilparuk bb16d9e951 Add health string generator to match `docker ps` output 2018-02-12 12:10:05 -08:00
Joffrey F a6459efcad Merge branch '4909-terminate-containers-on-sighup' of https://github.com/garribas/compose into garribas-4909-terminate-containers-on-sighup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 13:59:22 -08:00
Joffrey F c223c3fde9
Merge pull request #5625 from albers/option-consistency 
Add missing `-q|--quiet` options to increase consistency
 2018-02-07 13:54: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 8c297f267e Implement compatibility mode, 
translating deploy keys to equivalent v2 config if available

Enabled using `--compatibility` CLI flag

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-05 17:31:17 -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
Harald Albers 6cfbb7ed8a Add missing `-q|--quiet` options to increase consistency 
Signed-off-by: Harald Albers <github@albersweb.de>
 2018-01-30 01:28:15 +01:00
Joffrey F c5154d6b2b Don't break during recreate when a mount target is updated 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-23 15:25:25 -08:00
Joffrey F b64cfd1982
Merge pull request #5596 from docker/4337-recreate-anon-volumes 
Add up flag `--renew-anon-volumes` (shorthand -V)
 2018-01-23 10:07:33 -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 b07091ac5f Add up flag `--renew-anon-volumes` (shorthand -V) 
to avoid reusing the previous container's data

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-22 16:08:33 -08: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 7f22744658
Merge pull request #5566 from docker/mhank-5042-network-priorities 
Add support for network priority
 2018-01-12 14:40:17 -08:00