Update Docker from 1.12.1 to 1.12.2 #157
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Release notes [1][2]: > 1.12.2 (2016-10-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 > 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 > * 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 a panic due to a race condition filtering `docker ps` #26049 > * Implement retry logic to prevent "Unable to remove filesystem" errors when using the aufs storage driver #26536 > * Prevent devicemapper from removing device symlinks if `dm.use_deferred_removal` is enabled #24740 > * Fix an issue where the CLI did not return correct exit codes if a command was run with invalid options #26777 > * Fix a panic due to a bug in stdout / stderr processing in health checks #26507 > * Fix exec's children handling #26874 > * Fix exec form of HEALTHCHECK CMD #26208 > > Networking > ---------- > > * Fix a daemon start panic on armv5 #24315 > * Vendor libnetwork #26879 #26953 > * Avoid returning early on agent join failures docker/libnetwork#1473 > * Fix service published port cleanup issues docker/libetwork#1432 docker/libnetwork#1433 > * Recover properly from transient gossip failures docker/libnetwork#1446 > * Disambiguate node names known to gossip cluster to avoid node name collision docker/libnetwork#1451 > * Honor user provided listen address for gossip docker/libnetwork#1460 > * Allow reachability via published port across services on the same host docker/libnetwork#1398 > * Change the ingress sandbox name from random id to just `ingress_sbox` docker/libnetwork#1449 > * Disable service discovery in ingress network docker/libnetwork#1489 > > Swarm Mode > ---------- > > * Fix remote detection of a node's address when it joins the cluster #26211 > * Vendor SwarmKit #26765 > * Bounce session after failed status update docker/swarmkit#1539 > * Fix possible raft deadlocks docker/swarmkit#1537 > * Fix panic and endpoint leak when a service is updated with no endpoints docker/swarmkit#1481 > * Produce an error if the same port is published twice on `service create` or `service update` docker/swarmkit#1495 > * Fix an issue where changes to a service were not detected, resulting in the service not being updated docker/swarmkit#1497 > * Do not allow service creation on ingress network docker/swarmkit#1600 > > Contrib > ------- > > * Update the debian sysv-init script to use `dockerd` instead of `docker daemon` #25869 > * Improve stability when running the docker client on MacOS Sierra #26875 > > Windows > ------- > > * Fix an issue where arrow-navigation did not work when running the docker client in ConEmu #25578 Still get the source code by cloning the git repository, because building from the release tarballs currently fails [3]. [1] https://github.com/docker/docker/releases [2] https://github.com/docker/docker/releases/tag/v1.12.2 [3] https://github.com/docker/docker/issues/27581
Building Docker, we are not interested in the commit log, so only create a shallow clone of depth one.
That way, the build commands show up in the log.
Work around the tarball build issue [1], by setting the environment variable [1] `DOCKER_GITCOMMIT`. That way, the sources can be cashed, which is good. [1] https://github.com/docker/docker/issues/27581 [2] https://www.gnu.org/software/make/manual/html_node/Environment.html#Environment
| @@ -62,7 +62,7 @@ mee_configure() { | |||
|
|
|||
| mee_build() { | |||
| start_cmd make build | |||
| start_cmd make binary | |||
| start_cmd make DOCKER_GITCOMMIT=bb80604 binary | |||
There was a problem hiding this comment.
How is this fixed string going to be maintained when we update the package?
There was a problem hiding this comment.
git show tagnumber and take the commit from there, until upstream fixes this.
There was a problem hiding this comment.
Which would be extra work an can be forgotten or done wrongly. What is the disadvantage of the mee_extract() with git clone ?
There was a problem hiding this comment.
You don’t have to redownload the package each time. Bee’s defaults can be used.
|
Peter, please break the tie. |
| @@ -1,6 +1,6 @@ | |||
| #!/usr/bin/env beesh | |||
|
|
|||
| # BEE_VERSION docker-1.12.1-1.bee | |||
| # BEE_VERSION docker-1.12.2-1.bee | |||
There was a problem hiding this comment.
The suffix could be removed. 😆
|
Wers macht hat recht 😉 |
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improve the bee file, and update to the latest Docker version.
Tested on keineahnung, and heulsuse.