From 1e07a96fd0f7ed4009149dc0872f8d54bce33072 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 6 Mar 2017 10:14:36 +0100
Subject: [PATCH] docker: Update version from 1.12.3 to 17.03.0-ce
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Release notes [1][2][3]:

> ### 1.13.0 (2017-01-18) ###
>
> **IMPORTANT**: In Docker 1.13, the managed plugin api changed, as
> compared to the experimental version introduced in Docker 1.12. You
> must **uninstall** plugins which you installed with Docker 1.12
> *before* upgrading to Docker 1.13. You can uninstall plugins using the
> `docker plugin rm` command.
>
> If you have already upgraded to Docker 1.13 without uninstalling
> previously-installed plugins, you may see this message when the Docker
> daemon starts:
>
> ```
> Error starting daemon: json: cannot unmarshal string into Go value of
> type types.PluginEnv
> ```
>
> To manually remove all plugins and resolve this problem, take the
> following steps:
>
> *   Remove plugins.json from: `/var/lib/docker/plugins/`.
> *   Restart Docker. Verify that the Docker daemon starts with no errors.
> *   Reinstall your plugins.
>
> […]

> ### 1.13.1 (2017-02-08) ###
>
> **IMPORTANT**: On Linux distributions where `devicemapper` was the
> default storage driver, the `overlay2`, or `overlay` is now used by
> default (if the kernel supports it).  To use devicemapper, you can
> manually configure the storage driver to use through the
> `--storage-driver` daemon option, or by setting "storage-driver" in
> the `daemon.json` configuration file.
>
> […]

> ### v17.03.0-ce (2017-03-01) ###
>
> **IMPORTANT**: Starting with this release, Docker is on a monthly
> release cycle and uses a new YY.MM versioning scheme to reflect this.
> Two channels are available: monthly and quarterly.  Any given monthly
> release will only receive security and bugfixes until the next monthly
> release is available. Quarterly releases receive security and bugfixes
> for 4 months after initial release. This release includes bugfixes for
> 1.13.1 but there are no major feature additions and the API version
> stays the same.  Upgrading from Docker 1.13.1 to 17.03.0 is expected
> to be simple and low-risk.

Tested on *keineahnung*:

```
$ sudo docker version
Client:
 Version:      17.03.0-ce
 API version:  1.26
 Go version:   go1.7.5
 Git commit:   v17.03.0-ce
 Built:        Mon Mar  6 10:56:34 2017
 OS/Arch:      linux/amd64

Server:
 Version:      17.03.0-ce
 API version:  1.26 (minimum version 1.12)
 Go version:   go1.7.5
 Git commit:   v17.03.0-ce
 Built:        Mon Mar  6 10:56:34 2017
 OS/Arch:      linux/amd64
 Experimental: false
```

[1] https://github.com/docker/docker/releases/tag/v1.13.0
[2] https://github.com/docker/docker/releases/tag/v1.13.1
[3] https://github.com/docker/docker/releases/tag/v17.03.0-ce
---
 docker.be0 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker.be0 b/docker.be0
index 953988045..4d0f6ecb0 100755
--- a/docker.be0
+++ b/docker.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION docker-1.12.3-0
+# BEE_VERSION docker-17.03.0_ce-0
 
 # NOTE: We require a running docker environment. For the first bootstrap
 # this can be provided by the package docker_binary
@@ -12,7 +12,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="https://github.com/docker/docker/archive/v${PKGVERSION}.tar.gz"
+SRCURL[0]="https://github.com/docker/docker/archive/v${PKGFULLVERSION//_/-}.tar.gz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -62,7 +62,7 @@ mee_configure() {
 
 mee_build() {
     start_cmd make build
-    start_cmd make DOCKER_GITCOMMIT=${PKGVERSION} binary
+    start_cmd make DOCKER_GITCOMMIT=v${PKGVERSION}${PKGEXTRAVERSION_DASH} binary
 }
 
 mee_install() {
@@ -70,7 +70,7 @@ mee_install() {
     install --directory $D$SYSCONFDIR/default
     install --directory $D$SYSCONFDIR/systemd/system
 
-    V=$PKGVERSION
+    V=${PKGFULLVERSION//_/-}
 
     (
         cd $B/bundles/latest/binary-client
@@ -82,7 +82,7 @@ mee_install() {
         install --target-directory $D$BINDIR docker-containerd
         install --target-directory $D$BINDIR docker-containerd-ctr
         install --target-directory $D$BINDIR docker-containerd-shim
-        install docker-proxy-$V $D$BINDIR/docker-proxy
+        install docker-proxy $D$BINDIR/docker-proxy
         install --target-directory $D$BINDIR docker-runc
         install dockerd-$V $D$BINDIR/dockerd
     )