From 139b7ebe0989c2eccb6561e21754e90fee57509d Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 6 Dec 2016 17:40:11 -0800 Subject: [PATCH 1/9] Merge pull request #29187 from vieux/1.12.4-changelog bump version and changelog for 1.12.4-rc1 (cherry picked from commit caa6b86f389dcc405603f25ae8fb7cb835a46388) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 6c7a449aa58fb767e62dd8de6b612f35cade8c2f Component: engine --- components/engine/CHANGELOG.md | 74 ++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index fb42130129..274995e049 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -212,6 +212,80 @@ To manually remove all plugins and resolve this problem, take the following step - Deprecate MAINTAINER in Dockerfile [#25466](https://github.com/docker/docker/pull/25466) - Deprecated filter param for endpoint `/images/json` [#27872](https://github.com/docker/docker/pull/27872) +## 1.12.4 + +**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm +based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When +upgrading from an older version of docker, the upgrade process may not +automatically install the updated version of the unit file, or fail to start +the docker service if; + +- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or +- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive + +Starting the docker service will produce an error: + + Failed to start docker.service: Unit docker.socket failed to load: No such file or directory. + +or + + no sockets found via socket activation: make sure the service was started by systemd. + +To resolve this: + +- Backup the current version of the unit file, and replace the file with the + [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm) +- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present +- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present). + +After making those changes, run `sudo systemctl daemon-reload`, and `sudo +systemctl restart docker` to reload changes and (re)start the docker daemon. + + +### Runtime + +- Fix issue where volume metadata was not removed [#29083](https://github.com/docker/docker/pull/29083) +- Asynchronously close streams to prevent holding container lock [#29050](https://github.com/docker/docker/pull/29050) +- Fix selinux labels for newly created container volumes [#29050](https://github.com/docker/docker/pull/29050) +- Remove hostname validation [#28990](https://github.com/docker/docker/pull/28990) +- Fix deadlocks caused by IO races [#29095](https://github.com/docker/docker/pull/29095) +- Return an empty stats if the container is restarting [#29150](https://github.com/docker/docker/pull/29150) +- Fix volume store locking [#29151](https://github.com/docker/docker/pull/29151) +- Ensure consistent status code in API [#29150](https://github.com/docker/docker/pull/29150) +- Fix incorrect opaque directory permission in overlay2 [#29093](https://github.com/docker/docker/pull/29093) + +### Swarm Mode + +* Update Swarmkit [#29047](https://github.com/docker/docker/pull/29047) + - orchestrator/global: Fix deadlock on updates [docker/swarmkit#1760](https://github.com/docker/swarmkit/pull/1760) + - on leader switchover preserve the vxlan id for existing networks [docker/swarmkit#1773](https://github.com/docker/swarmkit/pull/1773) +- Refuse swarm spec not named "default" [#29152](https://github.com/docker/docker/pull/29152) + +### Networking + +* Update libnetwork [#29004](https://github.com/docker/docker/pull/29004) [#29146](https://github.com/docker/docker/pull/29146) + - Fix panic in embedded DNS [docker/libnetwork#1561](https://github.com/docker/libnetwork/pull/1561) + - Fix unmarhalling panic when passing --link-local-ip on global scope network [docker/libnetwork#1564](https://github.com/docker/libnetwork/pull/1564) + - Fix panic when network plugin returns nil StaticRoutes [docker/libnetwork#1563](https://github.com/docker/libnetwork/pull/1563) + - Fix panic in osl.(*networkNamespace).DeleteNeighbor [docker/libnetwork#1555](https://github.com/docker/libnetwork/pull/1555) + - Fix panic in swarm networking concurrent map read/write [docker/libnetwork#1570](https://github.com/docker/libnetwork/pull/1570) + * Allow encrypted networks when running docker inside a container [docker/libnetwork#1502](https://github.com/docker/libnetwork/pull/1502) + - Do not block autoallocation of IPv6 pool [docker/libnetwork#1538](https://github.com/docker/libnetwork/pull/1538) + - Set timeout for netlink calls [docker/libnetwork#1557](https://github.com/docker/libnetwork/pull/1557) + - Increase networking local store timeout to one minute [docker/libkv#140](https://github.com/docker/libkv/pull/140) + - Fix a panic in libnetwork.(*sandbox).execFunc [docker/libnetwork#1556](https://github.com/docker/libnetwork/pull/1556) + - Honor icc=false for internal networks [docker/libnetwork#1525](https://github.com/docker/libnetwork/pull/1525) + +### Logging + +* Update syslog log driver [#29150](https://github.com/docker/docker/pull/29150) + +### Contrib + +- Run "dnf upgrade" before installing in fedora [#29150](https://github.com/docker/docker/pull/29150) +- Add build-date back to RPM packages [#29150](https://github.com/docker/docker/pull/29150) +- Update selinux policy for distros based on RHEL7.3 [#29188](https://github.com/docker/docker/pull/29188) + ## 1.12.3 (2016-10-26) **IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm From 87ecb1281437a821a17c4953d23f45ca98bb0c36 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 7 Dec 2016 11:19:17 -0800 Subject: [PATCH 2/9] Merge pull request #29204 from andrewhsu/changelog-date [1.12.x] added date after version number in changelog (cherry picked from commit 4a13581d5786861ba66fa3e3483d43c0b57b3162) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 8dfd1919f5bf124630a49fba6097ced0ac4acf65 Component: engine --- components/engine/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index 274995e049..bb43595b22 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -212,7 +212,7 @@ To manually remove all plugins and resolve this problem, take the following step - Deprecate MAINTAINER in Dockerfile [#25466](https://github.com/docker/docker/pull/25466) - Deprecated filter param for endpoint `/images/json` [#27872](https://github.com/docker/docker/pull/27872) -## 1.12.4 +## 1.12.4 (2016-12-06) **IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When From 8b2b6ba5d8e7e1d02a72c4c6a69c8b2c62335faf Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 7 Dec 2016 13:47:58 -0800 Subject: [PATCH 3/9] update changelog Signed-off-by: Victor Vieux (cherry picked from commit 0d5bc84d061ee44d8af17efb5361be92cd182c50) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 603ea0682fbb6acc4538580f22c2b5b9327c1d03 Component: engine --- components/engine/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index bb43595b22..4b99ff5420 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -248,7 +248,7 @@ systemctl restart docker` to reload changes and (re)start the docker daemon. - Asynchronously close streams to prevent holding container lock [#29050](https://github.com/docker/docker/pull/29050) - Fix selinux labels for newly created container volumes [#29050](https://github.com/docker/docker/pull/29050) - Remove hostname validation [#28990](https://github.com/docker/docker/pull/28990) -- Fix deadlocks caused by IO races [#29095](https://github.com/docker/docker/pull/29095) +- Fix deadlocks caused by IO races [#29095](https://github.com/docker/docker/pull/29095) [#29141](https://github.com/docker/docker/pull/29141) - Return an empty stats if the container is restarting [#29150](https://github.com/docker/docker/pull/29150) - Fix volume store locking [#29151](https://github.com/docker/docker/pull/29151) - Ensure consistent status code in API [#29150](https://github.com/docker/docker/pull/29150) From d8197dd5db328a1911705045bbe1ca78a8c601f2 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 12 Dec 2016 15:00:06 -0800 Subject: [PATCH 4/9] Merge pull request #29338 from vieux/bump_1.12.4_version bump version to 1.12.4 (cherry picked from commit 1564f02e33aab7e30e6b0b72f418a7e950d79893) Signed-off-by: Sebastiaan van Stijn Upstream-commit: dee274848365c8c9f47c9b4c9783de87b062ed69 Component: engine --- components/engine/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index 4b99ff5420..c749bc7d90 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -212,7 +212,7 @@ To manually remove all plugins and resolve this problem, take the following step - Deprecate MAINTAINER in Dockerfile [#25466](https://github.com/docker/docker/pull/25466) - Deprecated filter param for endpoint `/images/json` [#27872](https://github.com/docker/docker/pull/27872) -## 1.12.4 (2016-12-06) +## 1.12.4 (2016-12-12) **IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When @@ -253,6 +253,7 @@ systemctl restart docker` to reload changes and (re)start the docker daemon. - Fix volume store locking [#29151](https://github.com/docker/docker/pull/29151) - Ensure consistent status code in API [#29150](https://github.com/docker/docker/pull/29150) - Fix incorrect opaque directory permission in overlay2 [#29093](https://github.com/docker/docker/pull/29093) +- Detect plugin content and error out on `docker pull` [#29297](https://github.com/docker/docker/pull/29297) ### Swarm Mode From 345c797f7fc64ec853260e861c9a51dd467d967e Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 13 Dec 2016 22:27:18 -0800 Subject: [PATCH 5/9] Merge pull request #29379 from vieux/1.12.5-rc1_bump 1.12.5-rc1 bump (cherry picked from commit 02394deb34ee43d1cc95fcfb86aa8fd774091c9b) Signed-off-by: Sebastiaan van Stijn Upstream-commit: c8ece052c12f8ba275d6e902a4e91d13a6aae620 Component: engine --- components/engine/CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index c749bc7d90..ab757a24ae 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -212,6 +212,41 @@ To manually remove all plugins and resolve this problem, take the following step - Deprecate MAINTAINER in Dockerfile [#25466](https://github.com/docker/docker/pull/25466) - Deprecated filter param for endpoint `/images/json` [#27872](https://github.com/docker/docker/pull/27872) +## 1.12.5 (2016-12-15) + +**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm +based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When +upgrading from an older version of docker, the upgrade process may not +automatically install the updated version of the unit file, or fail to start +the docker service if; + +- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or +- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive + +Starting the docker service will produce an error: + + Failed to start docker.service: Unit docker.socket failed to load: No such file or directory. + +or + + no sockets found via socket activation: make sure the service was started by systemd. + +To resolve this: + +- Backup the current version of the unit file, and replace the file with the + [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm) +- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present +- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present). + +After making those changes, run `sudo systemctl daemon-reload`, and `sudo +systemctl restart docker` to reload changes and (re)start the docker daemon. + + +### Contrib + +- Fix compilation on Darwin [#29370](https://github.com/docker/docker/pull/29370) +- Use the selinux policy provided by docker-selinux on CentOS [#29377](https://github.com/docker/docker/pull/29377) + ## 1.12.4 (2016-12-12) **IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm @@ -285,7 +320,7 @@ systemctl restart docker` to reload changes and (re)start the docker daemon. - Run "dnf upgrade" before installing in fedora [#29150](https://github.com/docker/docker/pull/29150) - Add build-date back to RPM packages [#29150](https://github.com/docker/docker/pull/29150) -- Update selinux policy for distros based on RHEL7.3 [#29188](https://github.com/docker/docker/pull/29188) +- deb package filename changed to include distro to distinguish between distro code names [#27829](https://github.com/docker/docker/pull/27829) ## 1.12.3 (2016-10-26) From 748adbd2d1ed39bd4d683e7c2a3e52dce08476eb Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 13 Dec 2016 20:08:39 -0800 Subject: [PATCH 6/9] add networking fox to changelog Signed-off-by: Victor Vieux (cherry picked from commit f6fbe58fbee9d619de079b3f1cdf995b202260c1) Signed-off-by: Sebastiaan van Stijn Upstream-commit: ef39dad14a6ff9887d11e8bef98d9fe97bc7edec Component: engine --- components/engine/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index ab757a24ae..eba383adb3 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -241,6 +241,9 @@ To resolve this: After making those changes, run `sudo systemctl daemon-reload`, and `sudo systemctl restart docker` to reload changes and (re)start the docker daemon. +### Networking + +- Fix panic in docker network ls when a network was created with `--ipv6` and no ipv6 `--subnet` in older docker versions [#29416](https://github.com/docker/docker/pull/29416) ### Contrib From c516489a71afaac20e9ba7c57965e66a43786847 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 13 Dec 2016 23:06:12 -0800 Subject: [PATCH 7/9] update changelog Signed-off-by: Victor Vieux (cherry picked from commit 0e5346df3276bab0f282e62f52f5c5b7732f97a3) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 650b381991ed2816fc66ebec96505c758e444739 Component: engine --- components/engine/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index eba383adb3..77033ca850 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -241,6 +241,10 @@ To resolve this: After making those changes, run `sudo systemctl daemon-reload`, and `sudo systemctl restart docker` to reload changes and (re)start the docker daemon. +### Runtime + +- Fix race on sending stdin close event [#29424](https://github.com/docker/docker/pull/29424) + ### Networking - Fix panic in docker network ls when a network was created with `--ipv6` and no ipv6 `--subnet` in older docker versions [#29416](https://github.com/docker/docker/pull/29416) From 7036bea4fdce096932767ee986a265accde26aac Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Thu, 15 Dec 2016 17:57:48 -0800 Subject: [PATCH 8/9] Merge pull request #29466 from vieux/bump_1.12.5 bump to 1.12.5 (cherry picked from commit 7392c3b0ce0f9d3e918a321c66668c5d1ef4f689) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 2a202ea4aad3a025f5e4e7785cc1830d4aca6ae3 Component: engine --- components/engine/CHANGELOG.md | 38 +++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index 77033ca850..d799c7539e 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -241,6 +241,43 @@ To resolve this: After making those changes, run `sudo systemctl daemon-reload`, and `sudo systemctl restart docker` to reload changes and (re)start the docker daemon. +**NOTE**: Docker 1.12.5 will correctly validate that either an IPv6 subnet is provided or +that the IPAM driver can provide one when you specify the `--ipv6` option. + +If you are currently using the `--ipv6` option _without_ specifying the +`--fixed-cidr-v6` option, the Docker daemon will refuse to start with the +following message: + +```none +Error starting daemon: Error initializing network controller: Error creating + default "bridge" network: failed to parse pool request + for address space "LocalDefault" pool " subpool ": + could not find an available, non-overlapping IPv6 address + pool among the defaults to assign to the network +``` + +To resolve this error, either remove the `--ipv6` flag (to preserve the same +behavior as in Docker 1.12.3 and earlier), or provide an IPv6 subnet as the +value of the `--fixed-cidr-v6` flag. + +In a similar way, if you specify the `--ipv6` flag when creating a network +with the default IPAM driver, without providing an IPv6 `--subnet`, network +creation will fail with the following message: + +```none +Error response from daemon: failed to parse pool request for address space + "LocalDefault" pool "" subpool "": could not find an + available, non-overlapping IPv6 address pool among + the defaults to assign to the network +``` + +To resolve this, either remove the `--ipv6` flag (to preserve the same behavior +as in Docker 1.12.3 and earlier), or provide an IPv6 subnet as the value of the +`--subnet` flag. + +The network network creation will instead succeed if you use an external IPAM driver +which supports automatic allocation of IPv6 subnets. + ### Runtime - Fix race on sending stdin close event [#29424](https://github.com/docker/docker/pull/29424) @@ -252,7 +289,6 @@ systemctl restart docker` to reload changes and (re)start the docker daemon. ### Contrib - Fix compilation on Darwin [#29370](https://github.com/docker/docker/pull/29370) -- Use the selinux policy provided by docker-selinux on CentOS [#29377](https://github.com/docker/docker/pull/29377) ## 1.12.4 (2016-12-12) From ad597464444414a35bf56754a42a4fff344a5b8e Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Tue, 10 Jan 2017 11:26:47 -0800 Subject: [PATCH 9/9] Bump version to 1.12.6 Signed-off-by: Kenfe-Mickael Laventure (cherry picked from commit 94dfa200668a2520d1fbd6a5a540887beebc28df) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 5e28d20e638346897225923d86cf1b0455ace501 Component: engine --- components/engine/CHANGELOG.md | 70 ++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/components/engine/CHANGELOG.md b/components/engine/CHANGELOG.md index d799c7539e..b1d7404025 100644 --- a/components/engine/CHANGELOG.md +++ b/components/engine/CHANGELOG.md @@ -212,6 +212,76 @@ To manually remove all plugins and resolve this problem, take the following step - Deprecate MAINTAINER in Dockerfile [#25466](https://github.com/docker/docker/pull/25466) - Deprecated filter param for endpoint `/images/json` [#27872](https://github.com/docker/docker/pull/27872) +## 1.12.6 (2017-01-10) + +**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm +based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When +upgrading from an older version of docker, the upgrade process may not +automatically install the updated version of the unit file, or fail to start +the docker service if; + +- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or +- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive + +Starting the docker service will produce an error: + + Failed to start docker.service: Unit docker.socket failed to load: No such file or directory. + +or + + no sockets found via socket activation: make sure the service was started by systemd. + +To resolve this: + +- Backup the current version of the unit file, and replace the file with the + [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm) +- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present +- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present). + +After making those changes, run `sudo systemctl daemon-reload`, and `sudo +systemctl restart docker` to reload changes and (re)start the docker daemon. + +**NOTE**: Docker 1.12.5 will correctly validate that either an IPv6 subnet is provided or +that the IPAM driver can provide one when you specify the `--ipv6` option. + +If you are currently using the `--ipv6` option _without_ specifying the +`--fixed-cidr-v6` option, the Docker daemon will refuse to start with the +following message: + +```none +Error starting daemon: Error initializing network controller: Error creating + default "bridge" network: failed to parse pool request + for address space "LocalDefault" pool " subpool ": + could not find an available, non-overlapping IPv6 address + pool among the defaults to assign to the network +``` + +To resolve this error, either remove the `--ipv6` flag (to preserve the same +behavior as in Docker 1.12.3 and earlier), or provide an IPv6 subnet as the +value of the `--fixed-cidr-v6` flag. + +In a similar way, if you specify the `--ipv6` flag when creating a network +with the default IPAM driver, without providing an IPv6 `--subnet`, network +creation will fail with the following message: + +```none +Error response from daemon: failed to parse pool request for address space + "LocalDefault" pool "" subpool "": could not find an + available, non-overlapping IPv6 address pool among + the defaults to assign to the network +``` + +To resolve this, either remove the `--ipv6` flag (to preserve the same behavior +as in Docker 1.12.3 and earlier), or provide an IPv6 subnet as the value of the +`--subnet` flag. + +The network network creation will instead succeed if you use an external IPAM driver +which supports automatic allocation of IPv6 subnets. + +### Runtime + +- Fix runC privilege escalation (CVE-2016-9962) + ## 1.12.5 (2016-12-15) **IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm