[Buildroot] [git commit branch/next] package/docker-engine: bump to v1.12.0

[Buildroot] [git commit branch/next] package/docker-engine: bump to v1.12.0

[Peter Korsgaard]

commit: https://git.buildroot.net/buildroot/commit/?id=f892015d78eb0f2cc7ddd754beabcf41bfa6da6b
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next

Bump docker-engine to the latest stable v1.12.0 from v1.12.0-rc3.

Signed-off-by: Christian Stewart <christian@paral.in>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/docker-engine/docker-engine.hash | 2 +-
 package/docker-engine/docker-engine.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
index 1de09f8..6078fbf 100644
--- a/package/docker-engine/docker-engine.hash
+++ b/package/docker-engine/docker-engine.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 bc256d2a348efbf236eab991254c925fa1917dd1e29cb40586f1696f4e24852e  docker-engine-v1.12.0-rc4.tar.gz
+sha256 f8139acba98248eb1fdb0b6d94efee89b876f9a50d00e263dc144fd2b0c372d4  docker-engine-v1.12.0.tar.gz
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index 80b0041..3d39aac 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_ENGINE_VERSION = v1.12.0-rc4
+DOCKER_ENGINE_VERSION = v1.12.0
 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
 
 DOCKER_ENGINE_LICENSE = Apache-2.0

[Buildroot] [git commit branch/next] package/docker-engine: bump to v1.12.0

[Thomas Petazzoni]

Hello,

On Tue, 16 Aug 2016 12:58:47 +0200, Peter Korsgaard wrote:
> commit: https://git.buildroot.net/buildroot/commit/?id=f892015d78eb0f2cc7ddd754beabcf41bfa6da6b
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
> 
> Bump docker-engine to the latest stable v1.12.0 from v1.12.0-rc3.
> 
> Signed-off-by: Christian Stewart <christian@paral.in>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

I believe this should have been committed to master. Indeed, we
packaged the -rc4 version, waiting for the final release, and this
patch precisely bumps to the final release. So it should have landed in
master IMO.

BTW, the patch description is wrong: it states that we're bumping from
-rc3 to final, but it's really bumping from -rc4 to final.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [git commit branch/next] package/docker-engine: bump to v1.12.0

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Hello,
 > On Tue, 16 Aug 2016 12:58:47 +0200, Peter Korsgaard wrote:
 >> commit: https://git.buildroot.net/buildroot/commit/?id=f892015d78eb0f2cc7ddd754beabcf41bfa6da6b
 >> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
 >> 
 >> Bump docker-engine to the latest stable v1.12.0 from v1.12.0-rc3.
 >> 
 >> Signed-off-by: Christian Stewart <christian@paral.in>
 >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

 > I believe this should have been committed to master. Indeed, we
 > packaged the -rc4 version, waiting for the final release, and this
 > patch precisely bumps to the final release. So it should have landed in
 > master IMO.

OK, that wasn't really clear to me and I hessitated about what to do. We
can add it to master as well.

-- 
Venlig hilsen,
Peter Korsgaard 

[Buildroot] [git commit branch/next] package/docker-engine: bump to v1.12.0

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Hello,
 > On Tue, 16 Aug 2016 12:58:47 +0200, Peter Korsgaard wrote:
 >> commit: https://git.buildroot.net/buildroot/commit/?id=f892015d78eb0f2cc7ddd754beabcf41bfa6da6b
 >> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
 >> 
 >> Bump docker-engine to the latest stable v1.12.0 from v1.12.0-rc3.
 >> 
 >> Signed-off-by: Christian Stewart <christian@paral.in>
 >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

 > I believe this should have been committed to master. Indeed, we
 > packaged the -rc4 version, waiting for the final release, and this
 > patch precisely bumps to the final release. So it should have landed in
 > master IMO.

 > BTW, the patch description is wrong: it states that we're bumping from
 > -rc3 to final, but it's really bumping from -rc4 to final.

Ok, I'll cherry-pick this + the runc bump from next and add to master.

-- 
Venlig hilsen,
Peter Korsgaard