4634 Commits

Author SHA1 Message Date
Vadim Semenov
6ff6528d45 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-13 17:37:26 -07:00
Joffrey F
c41057aa52 Code warning for the well-intentioned folks that keep wanting to change this
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Joffrey F
2d21bf6a50 Make sure y/n values are quoted in serialized output
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Joffrey F
af182bd3cc 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-13 17:37:26 -07:00
Joffrey F
d475e0c1e3 Add "network" field to build configuration
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Joffrey F
0916f124d0 scale property should be merged according to standard scalar rules
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Joffrey F
ec4ba7752f Fix override volume merging + add acceptance test
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Andy Neff
4796e04cae Change --volume behavior to add instead of replace mounts
Signed-off-by: Andy Neff <andrew.neff@visionsystemsinc.com>
2017-07-13 17:37:26 -07:00
Evan Shaw
154adc5807 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-13 17:37:26 -07:00
Joffrey F
41976b0f7f Add support for service:name pid config
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Evan Shaw
a891fc1d9a 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-13 17:37:26 -07:00
Joffrey F
5ee7aacca0 Bump docker Python SDK version -> 2.4.2
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Joffrey F
b4eaddf984 Add storage_opt to 2.2 schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Joffrey F
e22524474a Ignore test failures in storage_opt test
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
dinesh
6a957294df Add storage_opt in v2.1
Signed-off-by: dinesh <dineshpy07@gmail.com>
2017-07-13 17:37:26 -07:00
Joffrey F
1dfdbe6f94 Fix ports sorting on Python 3
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Joffrey F
bb4adf2b0f 1.15.0dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
NikitaVlaznev
3bd5a37429 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-07-13 17:37:26 -07:00
Joffrey F
a0119ae1a5 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-07-13 17:37:26 -07:00
Joel Barciauskas
59c4c2388e Add --quiet parameter to docker-compose pull, using existing silent flag
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
2017-07-13 17:37:26 -07:00
Joffrey F
86a0e36348 s/docker daemon/dockerd/
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Joffrey F
85d2c0a314 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-07-13 17:37:26 -07:00
Stefan Pietsch
33c7c750e8 check hash sums of downloaded files
Signed-off-by: Stefan Pietsch <mail.ipv4v6+gh@gmail.com>
2017-07-13 17:37:26 -07:00
Sebastiaan van Stijn
74f5037f78 Add Joffrey to maintainers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-13 17:37:26 -07:00
Colin Hebert
645d35612d Add support for labels during build
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-07-13 17:37:26 -07:00
Alexey Rokhin
5067f7a77b service_test.py reorder imports
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-07-13 17:37:26 -07:00
Alexey Rokhin
50d405fea3 skip cpu_percent test for Linux
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-07-13 17:37:26 -07:00
Joffrey F
8f0ef26a73 Improved version comparisons throughout the codebase
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-11 17:40:53 -07:00
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
Joffrey F
cffce0880b Bump 1.14.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-19 13:28:04 -07:00
Joffrey F
abac2eea37 Fix ps output to show all ports
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-19 13:28:04 -07:00