Commit Graph

3339 Commits

Author SHA1 Message Date
Harald Albers 6a773a018e Rename variables in bash completion
The old names were supposed to designate variables that get propagated
to the Docker daemon. This is not true for all contained options and
therefore confused me.
The new names focus on the placement after the top level command.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-16 16:05:19 +01:00
Harald Albers de2dd5b3d3 Add bash completion for `--project-directory`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-16 15:47:01 +01:00
Joffrey F a182300706 Merge pull request #4605 from shin-/4600-check-all-network-updates
Ensure network config matches remote for all properties
2017-03-14 13:56:43 -07:00
Joffrey F ac7693b92b Merge pull request #4604 from shin-/4584-interpolate-secrets
Interpolate secrets
2017-03-14 13:55:49 -07:00
Joffrey F 1e42061355 Merge pull request #4615 from shin-/4563-missing-comma
Add missing comma in DOCKER_CONFIG_KEYS
2017-03-14 13:55:27 -07:00
Joffrey F a6db78e5d4 Enable variable substitution in config.secrets
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 18:30:37 -07:00
Joffrey F 963b672cbd Ensure network config matches remote for all properties
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 15:48:38 -07:00
Joffrey F a2e32b8166 Add missing comma in DOCKER_CONFIG_KEYS
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 11:23:17 -07:00
Joffrey F 23b873c2ce Add "secrets" section to docker-compose config output when applicable
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-10 14:32:55 -08:00
Joffrey F dd294ce9cc Merge pull request #4591 from shin-/4580-log-api-error
Avoid encoding crash in log_api_error
2017-03-10 14:02:44 -08:00
Joffrey F beedceb66b Merge pull request #4589 from shin-/dbonev-2586-specify-cwd-parameter
Ability to change working directory via a CLI flag
2017-03-09 15:44:27 -08:00
Joffrey F 4e92b5bb85 Merge pull request #4590 from shin-/3474-self-referencing-ext-links
Prevent service to create a container if it is referencing itself in an external link
2017-03-09 15:36:48 -08:00
Joffrey F 7675553533 Merge pull request #4588 from shin-/hholst80-feature/compose-file-separator
Add environment variable to configure custom path separator when parsing COMPOSE_FILE entry
2017-03-09 15:35:44 -08:00
Joffrey F c3bcd59aeb Avoid encoding crash in log_api_error
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-09 15:23:13 -08:00
Joffrey F 1c3b0210e9 Merge pull request #4592 from albers/completion-rm--stop
Add bash completion for `docker-compose rm --stop`
2017-03-09 14:39:08 -08:00
Harald Albers ba0468395b Add bash completion for `docker-compose rm --stop`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-09 10:31:29 +01:00
Joffrey F 5ea9167334 Prevent service to create a container if it is referencing itself in an external link
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-08 18:29:09 -08: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 682b5b7480 Merge pull request #4586 from albers/completion-run--volume
Add bash completion for `run --volume`
2017-03-08 14:35:20 -08:00
Joffrey F 79d2f4d1e3 Merge pull request #4587 from albers/fix-completion-images
Fix bash completion for `docker-compose images`
2017-03-08 14:34:52 -08:00
Joffrey F ac12ab95c4 Rename COMPOSE_FILE_SEPARATOR -> COMPOSE_PATH_SEPARATOR
Add unit test

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-08 14:30:15 -08:00
Henrik Holst 1899eac2ba Fixes https://github.com/docker/compose/issues/4099
Signed-off-by: Henrik Holst <holst@matmech.com>
2017-03-08 14:22:40 -08:00
Joffrey F 05e1b3aa1d Merge pull request #4564 from shin-/dattran-vn01-issue/3790-support-build-arg-for-build-command
support --build-arg for build command
2017-03-08 14:17:21 -08:00
Harald Albers 38087a2888 Fix bash completion for `docker-compose images`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-08 13:07:25 -08:00
Harald Albers 0652530ee9 Add bash completion for `run --volume`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-08 12:49:31 -08:00
Joffrey F d5a2d37d05 Properly resolve build args against host environment values
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-07 18:13:11 -08:00
Dat Tran 449dcc9d7b support --build-arg for build command
Signed-off-by: Dat Tran <dattran.vn01@gmail.com>
2017-03-07 17:09:35 -08:00
Joffrey F dd4e49ef98 Merge pull request #4563 from shin-/3723-mem-reservation
Add mem_reservation option to service config in 2.0 and 2.1 formats
2017-03-07 15:23:22 -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 01fa147183 Merge pull request #4040 from rawkode/feature/allow-running-containers-to-be-deleted
Allowing running containers to be rm'd by stop flag
2017-03-06 18:34:19 -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
Joffrey F d75726db21 Merge pull request #4561 from shin-/JesusTinoco-3501-add-image-command-option
Add images command
2017-03-06 18:28:34 -08:00
Joffrey F 4dca6adeb1 Merge pull request #4562 from shin-/lindt-bugfix/unnamed_volumes_do_not_support_mode_suffix
Do not add mode to anonymous volumes in config output
2017-03-06 18:21:36 -08:00
Joffrey F ec252350ae Add mem_reservation option to service config in 2.0 and 2.1 formats
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 18:21:03 -08:00
Joffrey F bf7c2bc0f8 Use create_host_file in run -v tests to ensure file availability
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 18:13:16 -08:00
Joffrey F b454268f93 Merge pull request #4565 from shin-/onorua-pids-limit
Add pids_limit to service config
2017-03-06 18:09:53 -08:00
Joffrey F 2d56eb0c96 Merge pull request #4572 from shin-/Knetic-dnsopts
Implement dns_opt support in v2
2017-03-06 18:07:14 -08:00
Joffrey F 02a7b6bacc Merge pull request #4571 from shin-/marcosnils-master
Improve Dockerfile.run
2017-03-06 15:57:59 -08:00
Joffrey F 8f8678987b Improve readability of code and output for the images command
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 15:56:41 -08:00
Joffrey F 83728d2bcc Do not add mode in volume representation if it's not a host binding
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 14:43:29 -08:00
Joffrey F b6fb3f2634 pids_limit not yet supported for swarm services - removing from v3 format
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 14:32:04 -08:00
Joffrey F 7512dccaa8 Add dns_opt to 2.1 schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 13:28:52 -08:00
George Lester c7b8278e78 Implemented dns_opt
Signed-off-by: George Lester <glester491@gmail.com>
2017-03-03 15:37:21 -08:00
Marcos Lilljedahl 44653f2812 Improve Dockerfile.run
This dockerfile generates a more lightweight image that works with the
current official dynamically generated binaries

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>

Change image script to use new Dockerfile.run image without building
compose

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>

Apply suggested fixes

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>
2017-03-03 15:17:10 -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
Yaroslav Molochko 6a151aac04 introducing pids_limit, fix for #4178
Signed-off-by: Yaroslav Molochko <y.molochko@anchorfree.com>
2017-03-02 16:44:26 -08:00
stefan 11329e779b added failing test that ensures that named volume will not be printed with a mode suffix
Signed-off-by: stefan <think@hotmail.de>
2017-03-02 15:26:40 -08:00
Joffrey F 815a3af6d2 Fix docstring for images command
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-02 15:00:55 -08:00
Jesus Tinoco 90beeaf21c 3501 - Remove a test and fix other
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
2017-03-02 15:00:55 -08:00
Jesus Tinoco 33f510b340 3501 - Add a new command option (images)
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
2017-03-02 15:00:55 -08:00