tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-24 06:04:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,260 Commits 20 Branches 280 Tags
Commit Graph

4260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vadim Semenov
e52f019ac8 Optimize "extends" without file specification 
Loading the same config file add about 100ms per each extension
service, which results in painfully slow CLI calls when a config
consists of a couple of dozens of services.

This patch makes Compose re-use config files.

Signed-off-by: Vadim Semenov <protoss.player@gmail.com>
 2017-07-11 16:40:57 -07:00
Joffrey F
36772b555c Code warning for the well-intentioned folks that keep wanting to change this 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-06 17:54:45 -07:00
Joffrey F
d94fa5428e Make sure y/n values are quoted in serialized output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-06 15:15:12 -07:00
Joffrey F
abd395a5f3 Add 'socks' extra to help with proxy environment. 
SOCKS support will be included in the bundled (binary) version

Update some packages in requirements.txt and add some implicit deps

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-06 15:14:52 -07:00
Joffrey F
e33041582f Add "network" field to build configuration 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-06 12:17:46 -07:00
Joffrey F
55bd02f303 scale property should be merged according to standard scalar rules 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-05 13:10:50 -07:00
Joffrey F
2b7ed24bc0 Fix override volume merging + add acceptance test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-03 17:24:32 -07:00
Andy Neff
2dd5c7d51a Change --volume behavior to add instead of replace mounts 
Signed-off-by: Andy Neff <andrew.neff@visionsystemsinc.com>
 2017-07-03 17:24:32 -07:00
Evan Shaw
9cdbb953ba Align status output for parallel_execute 
Previously docker-compose would output lines that looked like:

    Starting service ... done
    Starting short ...
    Starting service-with-a-long-name ... done

It's difficult to scan down this output and get an idea of what's happening.

Now the statuses are aligned, and output looks like this:

    Starting service                  ... done
    Starting short                    ...
    Starting service-with-a-long-name ... done

To me, this is quite a bit easier to read.

Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-07-03 16:24:07 -07:00
Joffrey F
259b96748c Add support for service:name pid config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-03 16:15:20 -07:00
Evan Shaw
90e5d3447e Always silence pull output with --parallel 
This is how things were prior to the addition of the --quiet flag.
Making it not silent produces output that's weird and difficult to read.

Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-07-03 15:48:15 -07:00
Joffrey F
300b879d44 Bump docker Python SDK version -> 2.4.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-03 12:06:16 -07:00
Joffrey F
5c5a40c337 Add storage_opt to 2.2 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-27 12:51:21 -07:00
Joffrey F
515526f0ff Ignore test failures in storage_opt test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-27 12:51:21 -07:00
dinesh
4dd54b83e8 Add storage_opt in v2.1 
Signed-off-by: dinesh <dineshpy07@gmail.com>
 2017-06-27 12:51:21 -07:00
Joffrey F
f2054f1a7d Fix ports sorting on Python 3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-27 12:50:41 -07:00
Joffrey F
c38eaeaba3 1.15.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 14:05:04 -07:00
Joffrey F
f9bd31adad Bump 1.14.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 14:05:04 -07:00
Joffrey F
d81a27be02 Bump 1.14.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 14:05:04 -07:00
Joffrey F
73dfdfffb0 Bump 1.14.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 14:05:04 -07:00
NikitaVlaznev
78bb879419 Fix double silent argument value 
Fix for "TypeError: pull() got multiple values for keyword argument 'silent'."
This change e9b6cc23fc caused additional value to be passed for the 'silent' argument, that was already passed there: f85da99ef3

Signed-off-by: Nikita Vlaznev <nikita.dto@gmail.com>
 2017-06-19 13:01:55 -07:00
Joffrey F
7a4c328c41 Rewriting tests to be UCP/Swarm compatible 
- Event may contain more information in some cases.
  Don't assume order or format
- Don't assume ports are always exposed on 0.0.0.0 by default
- Absence of HostConfig in a create payload sometimes causes an error at the
  engine level
- In Swarm, volume names are prefixed by "<node_name>/"
- When testing against Swarm, the default network driver is overlay
- Ensure custom test networks are always attachable
- Handle Swarm network names
- Some params moved to host config in recent (1.21+) version
- Conditional test skips for Swarm environments

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-14 16:17:15 -07:00
Joel Barciauskas
e9b6cc23fc Add --quiet parameter to docker-compose pull, using existing silent flag 
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
 2017-06-14 14:53:13 -07:00
Joffrey F
d527f24ff0 Fix ps output to show all ports 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-12 11:42:29 -07:00
Joffrey F
f3c1c8d158 ServicePort merge_field should account for external IP and protocol 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-12 11:42:29 -07:00
Joffrey F
0bcfc721f8 s/docker daemon/dockerd/ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-09 12:06:55 -07:00
Joffrey F
821bd54663 Take editions into account when selecting test engine versions 
Get candidates from moby/moby and docker/docker-ce repos

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-09 12:06:55 -07:00
Stefan Pietsch
e8e2eb6e59 check hash sums of downloaded files 
Signed-off-by: Stefan Pietsch <mail.ipv4v6+gh@gmail.com>
 2017-06-08 17:42:43 -07:00
Joffrey F
8512b33e24 Remedy test failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F
0fa7163522 Interpolate configs values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F
bd8d77feae Add configs tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F
39c1cb5988 Partial support for service configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F
36af86b9b2 Always convert port values in ServicePort to integer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-05 15:51:22 -07:00
Joffrey F
bcc4a76ea0 Bump docker version in requirements.txt 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-05 15:02:51 -07:00
Sebastiaan van Stijn
10cda3dabf Add Joffrey to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-05-30 09:15:18 -07:00
Joffrey F
9a70db0889 Merge pull request #4864 from shin-/cred_spec_support 
Add partial support for v3.3 credential_spec
 2017-05-25 17:30:44 -07:00
Joffrey F
73d7865da8 Add partial support (docker-compose config and warnings) for v3.3 credential_spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-25 14:54:46 -07:00
Joffrey F
bf8498c488 Merge pull request #4861 from shin-/4825-cache-from 
Merge all fields inside build dict
 2017-05-25 14:44:56 -07:00
Joffrey F
347a7a8d2a Merge pull request #4862 from shin-/network_labels_check_warn 
Network label mismatch now prints a warning instead of raising an error
 2017-05-25 14:44:36 -07:00
Joffrey F
bbb771f108 Merge pull request #4863 from shin-/4038-build-labels-v2 
Add support for build labels in 2.1 and 2.2 format
 2017-05-25 14:31:21 -07:00
Joffrey F
49605f2715 Add support for build labels in 2.1 and 2.2 format 
Add cache_from in 2.2 format

Add integration test for build labels

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 15:53:06 -07:00
Joffrey F
2ba9cd73d1 Network label mismatch now prints a warning instead of raising an error 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 15:26:17 -07:00
Joffrey F
062812e4aa Merge all fields inside build dict 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 15:23:04 -07:00
Joffrey F
972fe65830 Merge pull request #4860 from shin-/4845-rm-stop 
Fix improper use of project.stop
 2017-05-23 15:08:13 -07:00
Joffrey F
98419ba2a2 Merge pull request #4859 from shin-/eliat123-4771-fix-allow-override-yaml-extension 
Fix: allow override yaml extension
 2017-05-23 15:08:00 -07:00
Joffrey F
d43a22fe57 Merge pull request #4858 from shin-/build_labels_v3.3 
Build labels v3.3
 2017-05-23 15:04:38 -07:00
Joffrey F
244209814b Fix improper use of project.stop 
Add some better test coverage for rm --stop

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 12:38:54 -07:00
Joffrey F
e9841bb9c6 Merge branch 'swoopla-master' 2017-05-23 12:19:42 -07:00
Pascal Vibet
7dafbd1e9c If COMPOSE_FILE is define then set this variable to the container 
Signed-off-by: Pascal Vibet <pvibet@gmail.com>
 2017-05-23 12:19:22 -07:00
Joffrey F
7f1f450080 Rewrite duplicate override error message 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 12:14:32 -07:00