Commit Graph

4083 Commits

Author SHA1 Message Date
Joffrey F 6cbedb78cc The interval is too damn small
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 15:22:51 -07:00
Joffrey F 14115a3570 Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 15:22:51 -07:00
Joffrey F 8c181b81ca Merge remote-tracking branch 'source/release' into bump-1.12.0-rc2 2017-03-23 15:19:15 -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 0d1608c17c Merge pull request #4662 from shin-/4651-tls-version-commandline
Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options
2017-03-23 15:16:03 -07:00
Joffrey F 6339440a3c Merge pull request #4653 from shin-/4644-extends-ports
Fix ports reparsing for service extends
2017-03-23 15:15:33 -07:00
Joffrey F f55c9d4201 Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-22 17:27:11 -07:00
Joffrey F a0add5cc12 Fix ports reparsing for service extends
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-22 15:14:13 -07:00
Joffrey F 402b0157d4 Merge pull request #4659 from docker/dependency_test_increase_interval
The interval is too damn small
2017-03-22 15:12:27 -07:00
Joffrey F 732bf52a4e The interval is too damn small
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-22 14:09:50 -07:00
Joffrey F 611f058cde Merge pull request #4632 from shin-/expanded-mounts
Add support for expanded mount/volume notation
2017-03-21 12:36:41 -07:00
Joffrey F 23a808e5c4 Merge pull request #4635 from docker/bump-1.12.0-rc1
Bump 1.12.0 RC1
2017-03-20 12:05:26 -07:00
Joffrey F d1a23cee85 Merge pull request #4641 from albers/completion-pull--parallel
Add bash completion for `pull --parallel`
2017-03-20 11:36:29 -07:00
Joffrey F 566cd1b1e4 Merge pull request #4640 from albers/completion-up--exit-code-from
Fix bash completion for `up --exit-code-from`
2017-03-20 11:36:07 -07:00
Joffrey F d40b6c02a3 Merge pull request #4637 from albers/completion-config--new-options
Add bash completion for `config --resolve-image-digests|--volumes"`
2017-03-20 11:35:29 -07:00
Harald Albers 0cf5f28f17 Add bash completion for `pull --parallel`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-20 16:37:41 +01:00
Harald Albers 02c294ee28 Fix bash completion for `up --exit-code-from`
`--exit-code-from` requires an argument.
Also corrected sort order.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-20 16:28:02 +01:00
Harald Albers 5fdbd5026a Add bash completion for `config --resolve-image-digests|--volumes"`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-19 08:00:35 -07:00
Joffrey F 5e0a793945 Bump 1.12.0-rc1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-18 16:48:10 -07:00
Joffrey F 442a5f6eeb Add support for expanded mount/volume notation
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-18 16:43:08 -07:00
Joffrey F 94fea2a461 Merge remote-tracking branch 'source/release' into bump-1.12.0-rc1 2017-03-18 15:44:33 -07:00
Joffrey F 9d2c6f156b Merge pull request #4333 from ucalgary/4332-config-image-digests
Add --resolve-image-digests option to docker-compose config command
2017-03-18 15:41:43 -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
King Chung Huang 962ba5b937 Extract image tag to digest code into a function
Extract the code in bundle() and config() that translates image tags
into digests into a function named image_digests_for_project().

Signed-off-by: King Chung Huang <kinghuang@mac.com>
2017-03-17 12:23:40 -06:00
King Chung Huang 0464476f08 Add unit test for image digests in config
Add two unit tests to validate that the denormalize_service_dict
function still works without passing a third argument for image_digest,
and correctly uses an image digest if one is provided.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
2017-03-17 12:22:40 -06:00
King Chung Huang 1da3ac4715 Add --resolve-image-digests argument to config command
Add a --resolve-image-digests argument to the config command that pins
images to a specific image digest, just like the bundle command. This
can be used to pin images in compose files being used to deploy stacks
in Docker 1.13.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
2017-03-17 12:21:28 -06:00
King Chung Huang 1a7e01c39a Add image digest arguments to config serialization
Add arguments for image digests in the config.serialize module to
optionally pin images to digests, like bundles.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
2017-03-17 12:19:13 -06:00
fate-grand-order 8471276e73 fix misspell "compatibility" in script/ci
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
2017-03-17 11:35:10 +08:00
Joffrey F 73aff2b50f Merge pull request #4621 from shin-/3880-handle-broken-pipe
Do not raise a broken pipe error when receiving SIGPIPE
2017-03-16 14:59:23 -07:00
Joffrey F 61b4d9d001 Merge pull request #4626 from albers/completion--project-directory
Add bash completion for `--project-directory`
2017-03-16 14:58:52 -07:00
Joffrey F eaee7aa5d0 Merge pull request #4625 from albers/completion-build--build-arg
Add bash completion for `build --build-arg`
2017-03-16 14:58:25 -07:00
Joffrey F b26562147c Merge pull request #4616 from dnephin/update-schema-v3.2
Synchronize the schema with docker/docker
2017-03-16 12:46:19 -07:00
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
Harald Albers 583c673c8a Add bash completion for `build --build-arg`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-16 11:37:06 +01:00
Joffrey F 7b19009511 Fix a handful of issues with 3.2 schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-15 17:11:53 -07:00
Daniel Nephin 2acf286ed6 Support V3.2
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-15 11:40:31 -04:00
Daniel Nephin 0ba1f61e9b Add schema for v3.2, and revert some changes made to v3.1 after it was released.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-15 11:38:20 -04:00
Joffrey F 56357d6117 Do not raise a broken pipe error when receiving SIGPIPE from grep or head
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-14 14:21:19 -07: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