Commit Graph

4158 Commits

Author SHA1 Message Date
Joffrey F 6361d907f6 Add support for blkio config keys
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F 7882f1fb06 Keep no-ansi parameter in the CLI scope
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Cecile Tonglet 444d888720 Add a flag --no-ansi to remove control characters on parallel executions
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
2017-08-21 13:09:19 -07:00
Joffrey F 7feb2685d2 Bump texttable dependency
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F 467e0d0d31 Fix ServiceExtendsResolver same-file detection
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F 4652d3c38a Use newer versions of pre-commit hooks
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Carl George bbebf518cf only require colorama on windows
Colorama is only useful on Windows by design.  Since it has no effect on
other platforms, it makes sense to not require it universally.

Signed-off-by: Carl George <carl@george.computer>
2017-08-21 13:09:19 -07:00
Joffrey F e0f7b075b8 1.16.0-dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F 1ae83d4139 0 is a valid value for a published port
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F 770d94376a Escape dollar sign in serialized config output
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F 73fd0abd5b Fix test issues with Engine 17.07 RC1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Harald Albers cf0afb071d Add bash completion for `pull --quiet`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-08-21 13:09:19 -07:00
Yong Wen Chua 16f8953c78 Add `target` to service build configuration
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-08-21 13:09:19 -07:00
Yong Wen Chua c006add122 Add Compose v2.3
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-08-21 13:09:19 -07:00
Joffrey F 92873edd65 Fix external secrets serialization
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F ec5d8264c9 Implement --scale option on up command, allow scale config in v2.2 format
docker-compose scale modified to reuse code between up and scale

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F ade23b585e Bump 1.15.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 16:50:14 -07:00
Kirin Rastogi 0e93080850 Add exclusion for networkname
Signed-off-by: Kirin Rastogi <kirin.Rastogi@avg.com>
Signed-off-by: Kirin Rastogi <rastogikirin@gmail.com>
2017-07-26 16:50:14 -07:00
Joffrey F 686a533c9f Scripts build and push compose-tests image
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 16:50:14 -07:00
Joffrey F c923ea1320 Some more test adjustments for Swarm support
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 16:50:14 -07:00
Evan Shaw 85b908ebef 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-26 16:50:14 -07:00
NikitaVlaznev 051726696b 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-26 16:50:14 -07:00
Joel Barciauskas 24065a15d8 Add --quiet parameter to docker-compose pull, using existing silent flag
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
2017-07-26 16:50:14 -07:00
Alexey Rokhin fd862f9ca7 service_test.py reorder imports
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-07-26 16:50:14 -07:00
Alexey Rokhin 31b161045d skip cpu_percent test for Linux
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-07-26 16:50:14 -07:00
Joffrey F 344a69331c Bump 1.15.0-rc1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
Joffrey F 56a23bfcd2 Improved version comparisons throughout the codebase
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-13 17:37:26 -07:00
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