Commit Graph

161 Commits

Author SHA1 Message Date
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 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 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
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 bb00352c34 Fix up_with_networks test
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-18 11:09:25 -07: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 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 ec0de7eb68
Merge pull request #5684 from docker/compat_mode
Compatibility mode
2018-02-26 10:42:59 -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 51076b5e12 Tests for compatibility mode
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-16 16:37:20 -08:00
Joffrey F 8c297f267e Implement compatibility mode,
translating deploy keys to equivalent v2 config if available

Enabled using `--compatibility` CLI flag

Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-05 17:31:17 -08:00
Joffrey F 593a675d2b Support mixed use of TLS flags and TLS environment variables
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-19 15:48:30 -08:00
Joffrey F c4fda0834d
Merge pull request #5384 from ilinum/1498-docker-compose-services
Implement --filter flag for docker-compose config --services and use it in bash completion
2018-01-09 17:02:04 -08:00
Joffrey F c8ba50ff1e Avoid CLI crash if image has no tags
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-12 15:26:20 -08:00
Joffrey F 8155ddc7ad Add support for custom names for networks, secrets, configs
Finalize v3.5 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 16:48:14 -08:00
Joffrey F 9098a67394
Merge pull request #5410 from sethktaylor11/5374-build-memory
Adds support for a memory build-arg in docker-compose build.
2017-12-04 14:00:09 -08:00
Samantha Miller a6cdd62726 Adds support for a memory flag to docker-compose build.
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-12-03 13:59:32 -06:00
Svyatoslav Ilinskiy be0b902631 Add ability to list and filter services in `ps`
Also, rename --filter "option=..." to --filter "key=..."

Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
2017-12-02 18:37:21 -06:00
Samantha Miller c36a2fb1ad Added a label option to 'docker-compose run' and test.
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-11-28 18:43:00 -06:00
Svyatoslav Ilinskiy 21e312e402 Implement --filter flag for docker-compose config --services.
Fix #1498
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
2017-11-17 17:43:12 -06:00
Guillermo Arribas b30cb77a7b docker-compose exec doesn't have -e option (fixes #4551)
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-25 13:22:00 -07:00
Guillermo Arribas eebc63c216 Allow empty default values in variable interpolation (fixes #5185)
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-20 13:45:47 -07:00
Guillermo Arribas aaa0773b4b Config command generates invalid volumes (fixes #5176)
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-16 12:06:04 -07:00
Marc van den Hoogen dc838067fd Add shm_size to build-options (issue #3866)
* Add shm_size to build configuration
 * Make it possible to enlarge/customize shm size during build
 * Value in bytes, or use string like "512M" or "1G" ...
 * Add to compose format 2.3 and (provisionally) >=3.5 format
 * Add automated test for shm_size in build-opts

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Made unit tests compatible with previously added shm_size build-option

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Also support shm_size build-opt when conf override

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Automated test for shm_size build-option

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Schema 3.4, add shm_size to schema 2.3, updated const.py

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Corrected typo in config_schema_v3.4

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Add support for g/m/k units for shm_size in build-opts

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Reorder imports in service.py

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
2017-09-29 15:50:17 -07:00
Joffrey F 0c4fc93895 Use newer versions of pre-commit hooks
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-02 20:02:26 -07:00
Joffrey F 6a4adb64f9 Some more test adjustments for Swarm support
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-20 16:39:03 -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
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
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
Eli Atzaba 0d0c0454e9 Raise exception when override.yaml & override.yml coexist
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
2017-05-23 12:09:19 -07:00
Eli Atzaba 9334f29898 Fix for yaml extention does not work with override file
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
2017-05-23 12:09:19 -07:00
Joffrey F 78ee612333 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-04-17 19:51:48 -07:00
Joffrey F eab1ee0eaf Support 'nocopy' mode for expanded volume syntax
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 15:17:23 -07:00
Joffrey F 69d0c0e3a0 Add support for expanded mount/volume notation
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-17 20:42:59 -07:00
Daniel Nephin 2acf286ed6 Support V3.2
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-15 11:40:31 -04:00
Dimitar Bonev 707210ae95 Ability to change working directory via a CLI flag
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2017-03-08 14:42:14 -08:00
Joffrey F e344fe9a9f Merge pull request #4566 from shin-/eddwardo-run-v
Add --volumes flag to docker-compose run
2017-03-07 15:22:51 -08:00
Joffrey F 0167aba2b7 Merge pull request #4541 from shin-/4502-expanded-port-syntax
Add support for expanded port syntax in 3.1 format
2017-03-06 18:32:52 -08:00
Piotr Szymanski 83388ec31a enable -v flag for docker-compose run command
Give user ability to attach volumes while running containers with
docker-compose run command. Example is given in the test implementation,
command is compatible with the one provided by docker engine.

Signed-off-by: Piotr Szymanski <skyleton@gmail.com>
2017-03-02 16:50:24 -08:00
Joffrey F 6986a994a8 Merge branch 'forward-exit' of https://github.com/TheClimateCorporation/compose into TheClimateCorporation-forward-exit
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 18:04:48 -08:00
kbroadwater 6c3641fdb7 Returing 1 when a container exits with a non-zero exit code with --abort-on-container-exit is set. Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
Catching the first container to exit Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>

Addressing feedback and fixing tests Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>

Adding break and removing extra fixture files Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>

Moving break Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
2017-03-01 17:08:26 -08:00
Joffrey F 1a77a7fd44 Merge pull request #3756 from nkovacs/2419-run-rm-volumes
Remove anonymous volumes when using run --rm.
2017-03-01 16:38:46 -08:00
Joffrey F 11788ef0ff Add support for expanded port syntax in 3.1 format
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 12:10:51 -08:00
Nathan J. Mehl cffb76d4d9 Address comments
- set flag name to `--exit-code-from` (and rename some variable,
  function and test names to match)
- force cascade_stop to true when exit-code-from flag is set
- use lambda in filter statement
- check that selected container name is in the project before running
- remove fancy parsing of service name to container mappings: if there
  are multiple containers in a service, return the first nonzero exit
  value if any
- flake8 changes

Signed-off-by: Nathan J. Mehl <n@climate.com>
2017-02-27 09:51:03 -08:00
Nathan J. Mehl a73190e1cc Add support for returning the exit value of a specific container
Current best practice for using docker-compose as a tool for continuous
integration requires fragile shell pipelines to query the exit status
of composed containers, e.g.:

http://stackoverflow.com/questions/29568352/using-docker-compose-with-ci-how-to-deal-with-exit-codes-and-daemonized-linked
http://blog.ministryofprogramming.com/docker-compose-and-exit-codes/

This PR adds a `--forward-exitval <container>` flag that allows
`docker-compose up` to return the exit value of a specified container.
The container may optionally have a number specified (foo_2) otherwise
the first is defaulted to.

Signed-off-by: Nathan J. Mehl <n@climate.com>
2017-02-27 08:37:11 -08:00
Joffrey F 951497c0f2 Merge pull request #4419 from shin-/4418-healthcheck-extends
Don't re-parse healthcheck values coming from extended services
2017-02-03 12:24:53 -08:00
Joffrey F cf43e6edf7 Don't re-parse healthcheck values coming from extended services
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-02 14:50:53 -08:00
Peter Urda a67500ee57
Added `top` to `docker-compose` to display running processes.
This commit allows `docker-compose` to access `top` for containers
much like running `docker top` directly on a given container.

This commit includes:

* `docker-compose` CLI changes to expose `top`
* Completions for `bash` and `zsh`
* Required testing for the new `top` command

Signed-off-by: Peter Urda <peter.urda@gmail.com>
2017-02-01 15:42:30 -08:00