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

812 Commits

Author SHA1 Message Date
Inconnu08 99e67d0c06 fix warning method is deprecated with tests 
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
 2019-05-15 23:46:12 +06:00
Henke Adolfsson 87935893fc
Update data for unit tests 
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
 2019-03-08 07:43:53 +01:00
Michael Irwin d8e390eb9f Added test case to verify fix for #6525 
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
 2019-03-07 15:30:11 +01:00
Peter Nagy (NPE) e34d329227 adds --no-interpolate to docker-compose config 
Signed-off-by: Peter Nagy <pnagy@gratex.com>
 2019-03-04 13:03:35 +01:00
slowr b09d8802ed Added additional argument (--env-file) for docker-compose to import environment variables from a given PATH. 
Signed-off-by: Dimitrios Mavrommatis <jim.mavrommatis@gmail.com>
 2019-02-26 16:38:54 +01:00
tuttieee 572032fc0b Fix Project#build_container_operation_with_timeout_func not to mutate a 'option' dict over multiple containers 
Signed-off-by: Yuichiro Tsuchiya <t.yic.yt@gmail.com>
 2019-02-25 13:07:41 +01:00
Ulysses Souza c8a621b637 Fix Flake8 lint 
This removes extra indentation and replace the use of `is` by `==` when
comparing strings

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-02-05 11:11:52 +01:00
Chris Crone 8f5f7e72be
Merge pull request #6466 from rumpl/credential-spec 
Support for credential_spec
 2019-01-21 11:03:34 +01:00
Djordje Lukic ae0f3c74a0 Support for credential_spec 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-01-17 16:00:22 +01:00
Djordje Lukic 0c20fc5d91 Resolve digests without pulling image 
If there is no image locally `docker-compose --resolve-image-digests`
will try and get the digest from the repository.

Fixes https://github.com/docker/compose/issues/5818

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-01-15 14:24:26 +01:00
Stephan Müller 56fbd22825
fix race condition after pulling image 
Signed-off-by: Stephan Müller <mail@stephanmueller.eu>
 2019-01-09 23:14:12 +01:00
Joffrey F 4bd93b95a9
Merge pull request #6406 from collin5/b5948 
Error on duplicate mount points.
 2019-01-02 10:11:50 -08:00
Collins Abitekaniza 47ff8d710c test create from config with duplicate mount points 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
 2019-01-02 17:51:22 +03:00
Andriy Maletsky 01eb4b6250 Lower severity to "warning" if `down` tries to remove nonexisting image 
Signed-off-by: Andriy Maletsky <andriy.maletsky@gmail.com>
 2018-12-28 13:21:23 -08:00
Joffrey F b7374b6271
Merge pull request #6390 from ulyssessouza/6369-override-networks-settings 
Fix merge on networks section
 2018-12-28 07:25:57 +09:00
Joffrey F 6b3855335e
Merge pull request #6410 from docker/2618-new-events-api 
Use improved API fields for project events when possible
 2018-12-28 07:22:24 +09:00
Joffrey F 5232100331 Merge branch 'feature/reject_environment_variable_that_contains_white_spaces' of https://github.com/hirochachacha/compose into hirochachacha-feature/reject_environment_variable_that_contains_white_spaces 2018-12-14 13:42:05 -08:00
Joffrey F 8b293d486e Use improved API fields for project events when possible 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-12-13 14:13:20 -08:00
Ulysses Souza a2bcf52665 Fix merge on networks section 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2018-12-11 10:36:49 +01:00
Hiroshi Ioka afc161a0b1 reject environment variable that contains white spaces 
Signed-off-by: Hiroshi Ioka <hirochachacha@gmail.com>
 2018-12-11 12:52:29 +09:00
Joffrey F d3933cd34a Move multi-push test to unit tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-12-04 17:13:40 -08:00
Joffrey F 61bb1ea484 Don't append slugs to containers created by "up" 
This change reverts the new naming convention introduced in 1.23 for service containers.
One-off containers will now use a slug instead of a sequential number as they do not
present addressability concerns and benefit from being capable of running in parallel.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-27 18:58:55 -08:00
Joffrey F eedbb28d5e
Merge pull request #6371 from docker/6354-url-builds 
Don't add long path prefix to build context URLs
 2018-11-26 17:47:36 -08:00
Joffrey F ccc777831c Don't add long path prefix to build context URLs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-26 15:26:27 -08:00
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
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 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 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
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 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 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 707e21183f Fix config hash consistency with unprioritized networks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 16:51:01 -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 9c2ffe6384 Avoid overriding external = False in serializer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 15:28:32 -04: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