- Update docker to 1.8.2 version

see detailed changelog in
  https://github.com/docker/docker/releases/tag/v1.8.2 
- devicemapper: fix zero-sized field access 
  Fix issue #15279: does not build with Go 1.5 tip
  Due to golang/go@7904946
  the devices field is dropped.
  This solution works on go1.4 and go1.5
  See more in https://github.com/docker/docker/pull/15404
  
  This fix was not included in v1.8.2. See previous link
  on why.
  fix_15279.patch: contains the patch for issue#15279

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=32
This commit is contained in:
Jordi Massaguer 2015-09-10 22:36:30 +00:00 committed by Git OBS Bridge
parent c59282bf35
commit 4771fe429a
5 changed files with 2121 additions and 6 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b937a66a1c797f0dbea016e23bbec80b9202689528de4f7e8ee82db93655e372
size 6772379

3
docker-1.8.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:457569ca8edd70293132789bfe51636f86cd8a46a60c6d02d5ee8600cf79f74b
size 7563667

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Thu Sep 10 22:33:01 UTC 2015 - jmassaguerpla@suse.com
- Update docker to 1.8.2 version
see detailed changelog in
https://github.com/docker/docker/releases/tag/v1.8.2
- devicemapper: fix zero-sized field access
Fix issue #15279: does not build with Go 1.5 tip
Due to golang/go@7904946
the devices field is dropped.
This solution works on go1.4 and go1.5
See more in https://github.com/docker/docker/pull/15404
This fix was not included in v1.8.2. See previous link
on why.
fix_15279.patch: contains the patch for issue#15279
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 21 08:46:30 UTC 2015 - normand@linux.vnet.ibm.com Fri Aug 21 08:46:30 UTC 2015 - normand@linux.vnet.ibm.com

View File

@ -16,16 +16,16 @@
# #
%define git_version 786b29d %define git_version 0a8c2e3
%define go_arches %ix86 x86_64 %define go_arches %ix86 x86_64
Name: docker Name: docker
Version: 1.8.1 Version: 1.8.2
Release: 0 Release: 0
Summary: The Linux container runtime Summary: The Linux container runtime
License: Apache-2.0 License: Apache-2.0
Group: System/Management Group: System/Management
Url: http://www.docker.io Url: http://www.docker.io
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.gz
Source1: docker.service Source1: docker.service
Source3: 80-docker.rules Source3: 80-docker.rules
Source4: sysconfig.docker Source4: sysconfig.docker
@ -43,6 +43,7 @@ Source100: sysconfig.docker.ppc64le
Patch0: fix-docker-init.patch Patch0: fix-docker-init.patch
# PATCH-FIX-OPENSUSE libcontainer-apparmor-fixes.patch -- mount rules aren't supported in our apparmor # PATCH-FIX-OPENSUSE libcontainer-apparmor-fixes.patch -- mount rules aren't supported in our apparmor
Patch1: libcontainer-apparmor-fixes.patch Patch1: libcontainer-apparmor-fixes.patch
Patch2: fix_15279.patch
# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ # Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
# Right now docker passes the sha1sum of the dockerinit binary to the docker binary at build time # Right now docker passes the sha1sum of the dockerinit binary to the docker binary at build time
# We cannot do that, right now a quick and really dirty way to get it running is # We cannot do that, right now a quick and really dirty way to get it running is
@ -141,6 +142,7 @@ Test package for docker. It contains the source code and the tests.
%setup -q -n docker-%{version} %setup -q -n docker-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%ifnarch %go_arches %ifnarch %go_arches
%patch100 -p1 %patch100 -p1
%patch101 -p0 %patch101 -p0

2089
fix_15279.patch Normal file

File diff suppressed because it is too large Load Diff