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

1379 Commits

Author SHA1 Message Date
Sebastian Pipping 6559af7660 Fix one-off commands for "restart: unless-stopped" (fixes #6302) 
Signed-off-by: Sebastian Pipping <sebastian@pipping.org>
 2018-11-26 23:23:56 +01:00
Collins Abitekaniza 05efe52ccd test --all flag 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2018-11-06 14:59:48 +03:00
Joffrey F d5eb209be0 Fix parse_key_from_error_msg to not error out on non-string keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-05 14:02:13 -08:00
Joffrey F db819bf0b2 Fix config merging for isolation and storage_opt keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-02 11:35:34 -07:00
Joffrey F 03bdd67eb5 Don't attempt to truncate a None value in Container.slug 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-31 13:55:20 -07:00
Joffrey F 4368b8ac05 Only use supported protocols when starting engine CLI subprocess 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-24 16:08:56 -07:00
Joffrey F 98bb68e404 Fix new flake8 errors/warnings 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-24 15:06:04 -07:00
Joffrey F 12ed765af8
Merge pull request #6282 from docker/6279-abolish-dot-separator 
Don't use dot as a path separator as it is a valid character in resource identifiers
 2018-10-16 17:43:37 -07:00
Joffrey F 62057d098f Don't use dot as a path separator as it is a valid character in resource identifiers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-16 17:21:57 -07:00
Joffrey F 4cb92294a3 Avoid creating duplicate mount points when recreating a service 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-16 13:57:01 -07:00
Joffrey F 9018511750
Merge pull request #6234 from zasca/tilda_src_paths 
Improved expanding source paths of volumes
 2018-10-08 18:51:40 +02:00
Alexander 9d7202d122 Squashed commit of the following: 
commit d3fbd3d630099dc0d34cb1a93b0a664f633a1c25
Author: zasca <gorstav@gmail.com>
Date:   Wed Oct 3 11:27:43 2018 +0600

    Fix typo in function name, path separator updated

commit bc3f03cd9a7702b3f2d96b18380d75e10f18def0
Author: zasca <gorstav@gmail.com>
Date:   Tue Oct 2 11:12:28 2018 +0600

    Fix endswith arg in the test

commit 602d2977b4e881850c99c7555bc284690a802815
Author: zasca <gorstav@gmail.com>
Date:   Mon Oct 1 12:24:17 2018 +0600

    Update test

commit 6cd7a4a2c411ddf9b8e7d91194c60fb2238db8d7
Author: zasca <gorstav@gmail.com>
Date:   Fri Sep 28 11:13:36 2018 +0600

    Fix last test

commit 0d37343433caceec18ea15babf924b5975b83c80
Author: zasca <gorstav@gmail.com>
Date:   Fri Sep 28 10:58:57 2018 +0600

    Unit test added

commit fc086e544677dd33bad798c773cb92600aaefc51
Author: zasca <gorstav@gmail.com>
Date:   Thu Sep 27 20:28:03 2018 +0600

    Improved expanding source paths of volumes

    defined with long syntax when paths starts with '~'

    Signed-off-by: Alexander <a.gorst.vinia@gmail.com>
 2018-10-05 14:52:56 +06:00
Joffrey F cc595a65f0 Don't attempt iterating on None during parallel pull 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-04 01:09:48 -07:00
Antony MECHIN 5b9b519e8a utils: Fix typo in unique_everseen. 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-27 14:17:32 +02:00
Antony MECHIN 39b0518850 tests.unity.service: Make sure volumes order is preserved. 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-26 15:57:27 +02:00
Antony MECHIN de1958c5ff utils: Add unique_everseen (from itertools recipies). 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-26 15:57:27 +02:00
Antony MECHIN bbcfce4029 tests.unit.config: Make sure volume order is preserved. 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-26 15:57:27 +02:00
Antony MECHIN 879f7cb1ed tests.unit.config: Make make_service_dict working dir argument optional. 
Signed-off-by: Antony MECHIN <antony.mechin@docker.com>
 2018-09-26 10:26:55 +02:00
Joffrey F cc2462e6f4 Don't rely on container names containing the db string to identify them 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-25 09:13:12 -07:00
Joffrey F 2a7beb6350
Merge pull request #6204 from docker/5716-unix-paths-from-winhost 
Don't convert slashes for UNIX paths on Windows hosts
 2018-09-21 10:47:22 -07:00
Joffrey F 834acca497 Update acceptance test for image matching 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-20 15:48:08 -07:00
Boris HUISGEN 1b668973a2 Add acceptance test 
Signed-off-by: Boris HUISGEN <bhuisgen@hbis.fr>
 2018-09-20 15:48:08 -07:00
Joffrey F 9f9122cd95 Don't convert slashes for UNIX paths on Windows hosts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-19 11:36:51 -07:00
Joffrey F 5916639383 Preserve container numbers, add slug to prevent name collisions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-12 12:07:52 -07:00
Joffrey F 4e2de3c1ff Replace sequential container indexes with randomly generated IDs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-11 15:26:58 -07:00
Joffrey F db391c03ad
Merge pull request #6100 from docker/5960-parallel-pull-progress 
Add progress messages to parallel pull
 2018-08-24 11:02:24 -07:00
Joffrey F eb63e9f3c7 Fix --project-directory handling to apply to .env files as well 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-10 17:02:56 -07:00
Joffrey F ee878aee4c Handle missing (not built) service image in config --hash 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 20:23:21 -07:00
Joffrey F 861031b9b7 Reduce config --hash code complexity and add test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 17:25:35 -07:00
Joffrey F 707e21183f Fix config hash consistency with unprioritized networks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 16:51:01 -07:00
Gil Raphaelli 89f2bfe4f3 add --parallel option to build 
Signed-off-by: Gil Raphaelli <g@raphaelli.com>
 2018-07-31 12:06:59 -04:00
Joffrey F 635c77db6c
Merge pull request #6071 from nickhiggs/6060-reattach-logger-on-restart 
Attach logger to containers after crashing.
 2018-07-25 15:20:43 -07:00
Joffrey F c956785cdc Add progress messages to parallel pull 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-25 14:39:18 -07:00
Joffrey F bb00352c34 Fix up_with_networks test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-18 11:09:25 -07:00
Joffrey F e6d18b1881 Fix --exit-code-from to reflect exit code after termination by Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-10 15:28:55 -04:00
Joffrey F 9c2ffe6384 Avoid overriding external = False in serializer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 15:28:32 -04:00
Nicholas Higgins 28085ebee2 Attach logger to containers after crashing. 
Fixes #6060

Signed-off-by: Nicholas Higgins <nickhiggins42@gmail.com>
 2018-07-09 08:47:20 +10:00
Joffrey F b00db08aa9 Prevent attempts to create image names starting with - or _ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-22 15:56:53 -07:00
Joffrey F c15c79ed2f
Merge pull request #5940 from docker/5929-underscore-projname 
Don't attempt to create resources with name starting with illegal chars
 2018-05-04 16:44:22 -07:00
Joffrey F d5ebc73482 Don't attempt to create resources with name starting with illegal characters 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-04 16:15:52 -07:00
Joffrey F f368b4846f Ignore attachable property on networks in compatibility mode 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-04 15:16:43 -07:00
Joffrey F c3bb958865 Ignore default platform if API version doesn't support platform param 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-04 14:51:53 -07:00
Joffrey F 5aafa54667 iprange -> ip_range 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-05-01 17:11:14 -07:00
Joffrey F aecc0de28f Prevent duplicate binds in generated container config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-26 15:20:45 -07:00
Joffrey F faa532c315
Merge pull request #5896 from docker/5874-legacy-proj-name 
Retrieve objects using legacy (< 1.21) project names
 2018-04-24 16:41:42 -07:00
Joffrey F 3b2ce82fa1 Use true_name for remove operation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-24 16:19:38 -07:00
Joffrey F fa3acbeb8d
Merge pull request #5897 from docker/5882-ipam_options_check 
Incorrect key name for IPAM options check
 2018-04-24 13:33:42 -07:00
Joffrey F fa6d837b49 Clearly define IPAM config schema for validation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-23 19:08:55 -07:00
Joffrey F 299ce6ad00 Incorrect key name for IPAM options check 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-23 18:16:58 -07:00
Joffrey F 8356576a9a Make sure error messages are unicode strings before combining 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-09 11:46:33 -07:00
Joffrey F 7aa51a18ff Fix port serialization with external IP 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-30 18:02:06 -07:00
Joffrey F 520f5d0fde Add 2.4 file format with platform support. Also reads DOCKER_DEFAULT_PLATFORM env 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-30 12:39:10 -07:00
Joffrey F 070474acae Fix unit tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-29 17:21:47 -07:00
Joffrey F 2e100353d3 Add support for build isolation parameter 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-29 16:57:07 -07:00
Joffrey F 344003a2f9 Ignore NotFound for external overlay networks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-28 16:49:00 -07:00
Joffrey F 8d96980ba4
Merge pull request #5833 from docker/5826-load_retry_utf8 
On load error, retry reading the file with UTF-8 encoding
 2018-03-28 11:45:04 -07:00
Joffrey F 90c57f99e8 On load error, retry reading the file with UTF-8 encoding 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-27 12:37:21 -07:00
Joffrey F 71d40c2a9b Avoid fallthrough with empty defaults 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-27 11:10:30 -07:00
Joffrey F 7e787a8c15
Merge pull request #5822 from brainlock/fix-gh-5179 
fix race condition in Service.create_container()
 2018-03-27 09:24:40 -07:00
Alberto Piai 394c8efe98 fix race condition in Service.create_container() 
The Service.create_container() method fetches a list of the current
containers in order to determine the next container number. In doing so,
it makes several API calls: one to fetch the list of containers, then
one per container in order to inspect it.

In some situations it can happen that a container is removed after
having been listed: in that case, the call to inspect will get a 404 and
raise a NotFound.

One situation in which this has been observed is when trying to
concurrently create multiple one-off containers for the same service
(using `docker-compose run` and a unique `--name`), as described in
more detail in gh-5179.

This patch adds a unit test that simulates the race between the
calls to list and to inspect, and changes Service._next_container_number
to skip removed containers instead of blowing up.

Fixes gh-5179

Signed-off-by: Alberto Piai <apiai@sensational.ch>
 2018-03-27 10:21:15 +02:00
Joffrey F 771a1382bd
Merge pull request #5819 from docker/5433-build-zip 
Add --compress option to build command
 2018-03-27 00:52:06 +02:00
Joffrey F cbb9bff924 Support -H=host notation for interactive run/execs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-26 14:25:31 -07:00
Joffrey F 255d16d7fa Add --compress option to build command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-23 17:05:15 +01:00
Joffrey F 876e1ba8d5
Merge pull request #5798 from mnottale/cpu-rt 
Add support for cpu_rt_period and cpu_rt_runtime.
 2018-03-19 06:51:25 -07:00
Joffrey F 6c7c7902f1
Merge pull request #5788 from mnottale/dash-underscore-in-project-name 
Allow dash and underscore in project name.
 2018-03-19 05:33:21 -07:00
Joffrey F 4a75fc7bbc
Merge pull request #5787 from mnottale/pull-parallel-by-default 
Pull parallel by default
 2018-03-19 05:19:32 -07:00
Matthieu Nottale 16ea49ac8c Add support for cpu_rt_period and cpu_rt_runtime. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-19 13:18:35 +01:00
Joffrey F b1ade31c67 Manage encoding errors in progress_stream 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-15 17:10:36 -07:00
Matthieu Nottale 8336407830 pull: Deprecate '--parallel' and enable it by default. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-15 15:47:29 +01:00
Matthieu Nottale 5fe3aff1c3 Allow dash and underscore in project name. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-15 15:44:43 +01:00
Joffrey F 0112c740ad Check volume config against remote and error out if diverged 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-12 17:19:03 -07:00
Joffrey F 867ad1550b
Merge pull request #5769 from docker/5766-fix-secopt-extend 
Preserve security_opt values in extends
 2018-03-08 18:20:56 -08:00
Joffrey F 85670e208b
Merge pull request #5751 from mnottale/cpu_period 
Add support for 'cpu_period' for compose v2.1-v2.3.
 2018-03-08 18:12:59 -08:00
Joffrey F 7e3bbef436 Preserve security_opt values in extends 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-03-08 18:03:54 -08:00
Matthieu Nottale b9f9643d24 Add support for 'cpu_period' for compose v2.1-v2.3. 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-03-07 15:23:24 +01:00
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