Accepting request 324525 from Virtualization:containers

- Update to docker 1.8.1(bsc#942369 and bsc#942370):
  - Fix a bug where pushing multiple tags would result in invalid images
- Update to docker 1.8.0:
  see detailed changelog in
  https://github.com/docker/docker/releases/tag/v1.8.0 
- remove docker-netns-aarch64.patch: This patch was adding 
   vendor/src/github.com/vishvananda/netns/netns_linux_arm64.go
  which is now included upstream, so we don't need this patch anymore

OBS-URL: https://build.opensuse.org/request/show/324525
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=21

docker-1.7.1.tar.bz2

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

docker-1.8.1.tar.bz2

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

docker-netns-aarch64.patch

@@ -1,10 +0,0 @@
---- /dev/null
-+++ vendor/src/github.com/vishvananda/netns/netns_linux_arm64.go
-@@ -0,0 +1,7 @@
-+// +build linux,arm64
-+
-+package netns
-+
-+const (
-+    SYS_SETNS = 268
-+)

docker.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Aug 13 09:00:25 UTC 2015 - jmassaguerpla@suse.com
+
+- Update to docker 1.8.1(bsc#942369 and bsc#942370):
+  - Fix a bug where pushing multiple tags would result in invalid images
+
+- Update to docker 1.8.0:
+  see detailed changelog in
+
+  https://github.com/docker/docker/releases/tag/v1.8.0 
+
+- remove docker-netns-aarch64.patch: This patch was adding 
+   vendor/src/github.com/vishvananda/netns/netns_linux_arm64.go
+  which is now included upstream, so we don't need this patch anymore
+
 -------------------------------------------------------------------
 Fri Jul 24 14:24:16 UTC 2015 - jmassaguerpla@suse.com
 

docker.spec

@@ -19,7 +19,7 @@
 %define git_version 786b29d
 %define go_arches %ix86 x86_64
 Name:           docker
-Version:        1.7.1
+Version:        1.8.1
 Release:        0
 Summary:        The Linux container runtime
 License:        Apache-2.0
@@ -49,7 +49,6 @@ Patch1:         libcontainer-apparmor-fixes.patch
 # to simply disable this check
 Patch100:       ignore-dockerinit-checksum.patch
 Patch101:       gcc-go-build-static-libgo.patch
-Patch102:       docker-netns-aarch64.patch
 BuildRequires:  bash-completion
 BuildRequires:  device-mapper-devel >= 1.2.68
 BuildRequires:  glibc-devel-static
@@ -145,7 +144,6 @@ Test package for docker. It contains the source code and the tests.
 %patch100
 %patch101
 %endif
-%patch102
 cp %{SOURCE7} .
 find . -name ".gitignore" | xargs rm
 

fix-docker-init.patch

@@ -1,12 +1,10 @@
-Index: docker/hack/make/.dockerinit
-===================================================================
---- docker.orig/hack/make/.dockerinit
-+++ docker/hack/make/.dockerinit
-@@ -29,5 +29,7 @@ else
+diff -Naur a/hack/make/.dockerinit b/hack/make/.dockerinit
+--- a/hack/make/.dockerinit	2015-08-11 18:35:27.000000000 +0200
++++ b/hack/make/.dockerinit	2015-08-12 18:14:25.743452565 +0200
+@@ -29,5 +29,6 @@
  	exit 1
  fi
  
 +/usr/bin/strip -s $DEST/dockerinit-$VERSION
-+
  # sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another
  export DOCKER_INITSHA1=$($sha1sum "$DEST/dockerinit-$VERSION" | cut -d' ' -f1)

ignore-dockerinit-checksum.patch

@@ -1,5 +1,6 @@
---- utils/utils.go
-+++ utils/utils.go
+diff -Naur a/utils/utils.go b/utils/utils.go
+--- a/utils/utils.go	2015-08-11 18:35:27.000000000 +0200
++++ b/utils/utils.go	2015-08-12 18:06:47.930445696 +0200
 @@ -76,7 +76,7 @@
  		}
  		return os.SameFile(targetFileInfo, selfPathFileInfo)
@@ -8,4 +9,4 @@
 +	return true
  }
  
- // Figure out the path of our dockerinit (which may be SelfPath())
+ // DockerInitPath figures out the path of our dockerinit (which may be SelfPath())

libcontainer-apparmor-fixes.patch

@@ -1,12 +1,11 @@
-Index: docker/vendor/src/github.com/docker/libcontainer/apparmor/gen.go
-===================================================================
---- docker.orig/vendor/src/github.com/docker/libcontainer/apparmor/gen.go
-+++ docker/vendor/src/github.com/docker/libcontainer/apparmor/gen.go
-@@ -25,7 +25,6 @@ profile {{.Name}} flags=(attach_disconne
-   network,
-   capability,
-   file,
--  umount,
+diff -Naur a/contrib/apparmor/docker-engine b/contrib/apparmor/docker-engine
+--- a/contrib/apparmor/docker-engine	2015-08-11 18:35:27.000000000 +0200
++++ b/contrib/apparmor/docker-engine	2015-08-12 18:05:07.608444190 +0200
+@@ -13,7 +13,6 @@
+   mount -> /sys/**,
+   mount -> /run/docker/netns/**,
  
-   deny @{PROC}/sys/fs/** wklx,
-   deny @{PROC}/sysrq-trigger rwklx,
+-  umount,
+   pivot_root,
+   signal (receive) peer=@{profile_name},
+   signal (receive) peer=unconfined,