From d5b9b8bf0f66fe30bb64a10420a0812889a59754 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Fri, 28 Sep 2018 12:42:43 -0700 Subject: [PATCH 1/4] Update release notes and reference for upcoming Compose 1.23.0 release Signed-off-by: Joffrey F --- compose/reference/config.md | 3 ++ release-notes/docker-compose.md | 59 +++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/compose/reference/config.md b/compose/reference/config.md index 5292b575f2..5944912d09 100644 --- a/compose/reference/config.md +++ b/compose/reference/config.md @@ -14,6 +14,9 @@ Options: anything. --services Print the service names, one per line. --volumes Print the volume names, one per line. + --hash="*" Print the service config hash, one per line. + Set "service1,service2" for a list of specified services + or use the wildcard symbol to display all services ``` Validate and view the Compose file. diff --git a/release-notes/docker-compose.md b/release-notes/docker-compose.md index 707d3f2a88..35daf979d4 100644 --- a/release-notes/docker-compose.md +++ b/release-notes/docker-compose.md @@ -5,6 +5,65 @@ keywords: release notes, compose toc_max: 2 --- +## 1.23.0 (2018-10-10) + +### Important note + +The default naming scheme for containers created by Compose in this version +has changed from `__` to +`___`, where `` is a randomly-generated +hexadecimal string. Please make sure to update scripts relying on the old +naming scheme accordingly before upgrading. + +### Features + +- Logs for containers restarting after a crash will now appear in the output + of the `up` and `logs` commands. + +- Added `--hash` option to the `docker-compose config` command, allowing users + to print a hash string for each service's configuration to facilitate rolling + updates. + +- Output for the `pull` command now reports status / progress even when pulling + multiple images in parallel. + +- For images with multiple names, Compose will now attempt to match the one + present in the service configuration in the output of the `images` command. + +### Bugfixes + +- Parallel `run` commands for the same service will no longer fail due to name + collisions. + +- Fixed an issue where paths longer than 260 characters on Windows clients would + cause `docker-compose build` to fail. + +- Fixed a bug where attempting to mount `/var/run/docker.sock` with + Docker Desktop for Windows would result in failure. + +- The `--project-directory` option is now used by Compose to determine where to + look for the `.env` file. + +- `docker-compose build` no longer fails when attempting to pull an image with + credentials provided by the gcloud credential helper. + +- Fixed the `--exit-code-from` option in `docker-compose up` to always report + the actual exit code even when the watched container isn't the cause of the + exit. + +- Fixed a bug that caused hash configuration with multiple networks to be + inconsistent, causing some services to be unnecessarily restarted. + +- Fixed a pipe handling issue when using the containerized version of Compose. + +- Fixed a bug causing `external: false` entries in the Compose file to be + printed as `external: true` in the output of `docker-compose config` + +### Miscellaneous + +- The `zsh` completion script has been updated with new options, and no + longer suggests container names where service names are expected. + ## 1.22.0 (2018-07-17) ### New features From 5a2e15dc042d811333055caa196c6404e45deb47 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 29 Oct 2018 11:50:49 -0700 Subject: [PATCH 2/4] Final Compose 1.23.0 updates Signed-off-by: Joffrey F --- _config.yml | 2 +- compose/reference/build.md | 1 + release-notes/docker-compose.md | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 00069b631f..406e72ec09 100644 --- a/_config.yml +++ b/_config.yml @@ -23,7 +23,7 @@ latest_stable_docker_engine_api_version: "1.37" docker_ce_stable_version: "18.03" docker_ce_edge_version: "18.05" docker_ee_version: "17.06" -compose_version: "1.22.0" +compose_version: "1.23.0" machine_version: "0.14.0" distribution_version: "2.6" dtr_version: "2.5" diff --git a/compose/reference/build.md b/compose/reference/build.md index af41c55888..0bac60a39d 100644 --- a/compose/reference/build.md +++ b/compose/reference/build.md @@ -16,6 +16,7 @@ Options: --pull Always attempt to pull a newer version of the image. -m, --memory MEM Sets memory limit for the build container. --build-arg key=val Set build-time variables for services. + --parallel Build images in parallel. ``` Services are built once and then tagged, by default as `project_service`. For diff --git a/release-notes/docker-compose.md b/release-notes/docker-compose.md index 35daf979d4..d320b26daa 100644 --- a/release-notes/docker-compose.md +++ b/release-notes/docker-compose.md @@ -5,7 +5,7 @@ keywords: release notes, compose toc_max: 2 --- -## 1.23.0 (2018-10-10) +## 1.23.0 (2018-10-30) ### Important note @@ -24,6 +24,9 @@ naming scheme accordingly before upgrading. to print a hash string for each service's configuration to facilitate rolling updates. +- Added `--parallel` flag to the `docker-compose build` command, allowing + Compose to build up to 5 images simultaneously. + - Output for the `pull` command now reports status / progress even when pulling multiple images in parallel. @@ -51,14 +54,27 @@ naming scheme accordingly before upgrading. the actual exit code even when the watched container isn't the cause of the exit. +- Fixed an issue that would prevent recreating a service in some cases where + a volume would be mapped to the same mountpoint as a volume declared inside + the image's Dockerfile. + - Fixed a bug that caused hash configuration with multiple networks to be inconsistent, causing some services to be unnecessarily restarted. +- Fixed a bug that would cause failures with variable substitution for services + with a name containing one or more dot characters + - Fixed a pipe handling issue when using the containerized version of Compose. - Fixed a bug causing `external: false` entries in the Compose file to be printed as `external: true` in the output of `docker-compose config` +- Fixed a bug where issuing a `docker-compose pull` command on services + without a defined image key would cause Compose to crash + +- Volumes and binds are now mounted in the order they're declared in the + service definition + ### Miscellaneous - The `zsh` completion script has been updated with new options, and no From 441c5b572b842bfd98df15b3f37c2d998efbf9ef Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Tue, 30 Oct 2018 14:20:20 -0700 Subject: [PATCH 3/4] Minor edits --- compose/reference/config.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compose/reference/config.md b/compose/reference/config.md index 5944912d09..56542663ab 100644 --- a/compose/reference/config.md +++ b/compose/reference/config.md @@ -10,13 +10,12 @@ Usage: config [options] Options: --resolve-image-digests Pin image tags to digests. - -q, --quiet Only validate the configuration, don't print - anything. + -q, --quiet Only validate the configuration – do not print anything. --services Print the service names, one per line. --volumes Print the volume names, one per line. --hash="*" Print the service config hash, one per line. Set "service1,service2" for a list of specified services - or use the wildcard symbol to display all services + or use the wildcard symbol to display all services. ``` Validate and view the Compose file. From 2e48d28232f2e3fd440193b7b2f167d72d26f038 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Tue, 30 Oct 2018 14:28:57 -0700 Subject: [PATCH 4/4] Final edits --- release-notes/docker-compose.md | 61 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/release-notes/docker-compose.md b/release-notes/docker-compose.md index d320b26daa..522813ad00 100644 --- a/release-notes/docker-compose.md +++ b/release-notes/docker-compose.md @@ -33,9 +33,9 @@ naming scheme accordingly before upgrading. - For images with multiple names, Compose will now attempt to match the one present in the service configuration in the output of the `images` command. -### Bugfixes +### Bug Fixes -- Parallel `run` commands for the same service will no longer fail due to name +- Fixed an issue where parallel `run` commands for the same service would fail due to name collisions. - Fixed an issue where paths longer than 260 characters on Windows clients would @@ -48,32 +48,31 @@ naming scheme accordingly before upgrading. look for the `.env` file. - `docker-compose build` no longer fails when attempting to pull an image with - credentials provided by the gcloud credential helper. + credentials provided by the ***gcloud credential helper***. - Fixed the `--exit-code-from` option in `docker-compose up` to always report - the actual exit code even when the watched container isn't the cause of the + the actual exit code even when the watched container is not the cause of the exit. - Fixed an issue that would prevent recreating a service in some cases where - a volume would be mapped to the same mountpoint as a volume declared inside - the image's Dockerfile. + a volume would be mapped to the same mountpoint as a volume declared within the Dockerfile for that image. - Fixed a bug that caused hash configuration with multiple networks to be inconsistent, causing some services to be unnecessarily restarted. - Fixed a bug that would cause failures with variable substitution for services - with a name containing one or more dot characters + with a name containing one or more dot characters. - Fixed a pipe handling issue when using the containerized version of Compose. - Fixed a bug causing `external: false` entries in the Compose file to be - printed as `external: true` in the output of `docker-compose config` + printed as `external: true` in the output of `docker-compose config`. - Fixed a bug where issuing a `docker-compose pull` command on services - without a defined image key would cause Compose to crash + without a defined image key would cause Compose to crash. -- Volumes and binds are now mounted in the order they're declared in the - service definition +- Volumes and binds are now mounted in the order they are declared in the + service definition. ### Miscellaneous @@ -101,7 +100,7 @@ naming scheme accordingly before upgrading. - Added support for extension fields in service, network, and volume configurations -### Bugfixes +### Bug Fixes - Fixed a bug that prevented deployment with some Compose files when `DOCKER_DEFAULT_PLATFORM` was set @@ -135,14 +134,14 @@ naming scheme accordingly before upgrading. ## 1.21.2 (2018-05-03) -### Bugfixes +### Bug Fixes - Fixed a bug where the ip_range attirbute in IPAM configs was prevented from passing validation ## 1.21.1 (2018-04-27) -### Bugfixes +### Bug Fixes - In 1.21.0, we introduced a change to how project names are sanitized for internal use in resource names. This caused issues when manipulating an @@ -207,7 +206,7 @@ naming scheme accordingly before upgrading. - `docker-compose build` now supports the use of Dockerfile from outside the build context. -### Bugfixes +### Bug Fixes - Compose now checks that the volume's configuration matches the remote volume, and errors out if a mismatch is detected. @@ -278,7 +277,7 @@ naming scheme accordingly before upgrading. - Added the long-form `--detach` option to the `exec`, `run` and `up` commands -### Bugfixes +### Bug Fixes - Fixed `.dockerignore` handling, notably with regard to absolute paths and last-line precedence rules @@ -367,7 +366,7 @@ naming scheme accordingly before upgrading. - Bash completion should now be able to better differentiate between running, stopped and paused services -### Bugfixes +### Bug Fixes - Fixed a bug that would cause the `build` command to report a connection error when the build context contained unreadable files or FIFO objects. @@ -450,7 +449,7 @@ naming scheme accordingly before upgrading. - Setting `stop_grace_period` in service definitions now also sets the container's `stop_timeout` -### Bugfixes +### Bug Fixes - Fixed an issue where Compose was still handling service hostname according to legacy engine behavior, causing hostnames containing dots to be cut up @@ -519,7 +518,7 @@ naming scheme accordingly before upgrading. resources (networks, volumes, containers) without starting services. The `create` command is deprecated in favor of this new option -### Bugfixes +### Bug Fixes - Fixed a bug where `extra_hosts` values would be overridden by extension files instead of merging together @@ -571,7 +570,7 @@ naming scheme accordingly before upgrading. - Added new CLI flag `--no-ansi` to suppress ANSI control characters in output -### Bugfixes +### Bug Fixes - Fixed a bug where nested `extends` instructions weren't resolved properly, causing "file not found" errors @@ -626,7 +625,7 @@ naming scheme accordingly before upgrading. - Some improvements to CLI output -### Bugfixes +### Bug Fixes - Volumes specified through the `--volume` flag of `docker-compose run` now complement volumes declared in the service's defintion instead of replacing @@ -678,7 +677,7 @@ naming scheme accordingly before upgrading. - Differences in labels between the Compose file and remote network will now print a warning instead of preventing redeployment. -### Bugfixes +### Bug Fixes - Fixed a bug where service's dependencies were being rescaled to their default scale when running a `docker-compose run` command @@ -729,7 +728,7 @@ naming scheme accordingly before upgrading. - Added support for `options` in the `ipam` section of network definitions -### Bugfixes +### Bug Fixes - Fixed a bug where paths provided to compose via the `-f` option were not being resolved properly @@ -823,7 +822,7 @@ naming scheme accordingly before upgrading. - Added support for port range to single port in port mappings, such as `8000-8010:80`. -### Bugfixes +### Bug Fixes - `docker-compose run --rm` now removes anonymous volumes after execution, matching the behavior of `docker run --rm`. @@ -857,7 +856,7 @@ naming scheme accordingly before upgrading. ## 1.11.2 (2017-02-17) -### Bugfixes +### Bug Fixes - Fixed a bug that was preventing secrets configuration from being loaded properly @@ -877,7 +876,7 @@ naming scheme accordingly before upgrading. ## 1.11.1 (2017-02-09) -### Bugfixes +### Bug Fixes - Fixed a bug where the 3.1 file format was not being recognized as valid by the Compose parser @@ -897,7 +896,7 @@ naming scheme accordingly before upgrading. - Introduced the `docker-compose top` command that displays processes running for the different services managed by Compose. -### Bugfixes +### Bug Fixes - Fixed a bug where extending a service defining a healthcheck dictionary would cause `docker-compose` to error out. @@ -907,7 +906,7 @@ naming scheme accordingly before upgrading. ## 1.10.1 (2017-02-01) -### Bugfixes +### Bug Fixes - Fixed an issue where presence of older versions of the docker-py package would cause unexpected crashes while running Compose @@ -957,7 +956,7 @@ naming scheme accordingly before upgrading. - Added support for the `stop_grace_period` option in service definitions. -### Bugfixes +### Bug Fixes - Colored output now works properly on Windows. @@ -984,7 +983,7 @@ naming scheme accordingly before upgrading. environment variable `COMPOSE_CONVERT_WINDOWS_PATHS=1`. Users of Docker for Windows are not affected and do not need to set the variable. -New Features +### New Features - Interactive mode for `docker-compose run` and `docker-compose exec` is now supported on Windows platforms. The `docker` binary @@ -1011,7 +1010,7 @@ New Features - Overriding a `logging` configuration will now properly merge the `options` mappings if the `driver` values do not conflict. -Bug Fixes +### Bug Fixes - Fixed several bugs related to `npipe` protocol support on Windows.