Accepting request 294716 from Virtualization

1

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

0002-Stripped-dockerinit-binary.patch

@@ -23,7 +23,7 @@ Index: docker/project/make/.dockerinit
  	exit 1
  fi
  
-+/usr/bin/strip -g $DEST/dockerinit-$VERSION
++/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)"

docker.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Apr  3 19:57:38 UTC 2015 - dmueller@suse.com
+
+- enable build for armv7l
+
+-------------------------------------------------------------------
+Fri Apr  3 14:59:35 UTC 2015 - fcastelli@suse.com
+
+- Updated docker.spec to fixed building with the latest version of our
+  Go pacakge.
+- Updated 0002-Stripped-dockerinit-binary.patch to fix check made by
+  the docker daemon against the dockerinit binary.
+
+-------------------------------------------------------------------
+Fri Mar 27 10:29:35 UTC 2015 - fcastelli@suse.com
+
+- Updated systemd service and socket units to fix socket activation
+  and to align with best practices recommended by upstram. Moreover
+  socket activation fixes bnc#920645.
+
 -------------------------------------------------------------------
 Wed Feb 11 13:59:01 UTC 2015 - fcastelli@suse.com
 

docker.service

@@ -1,13 +1,17 @@
-[Unit]
-Description=Docker
-Requires=network.target
-After=multi-user.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/sysconfig/docker
-ExecStart=/usr/bin/docker -d $DOCKER_OPTS
-
-[Install]
-WantedBy=multi-user.target
-
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.com
+After=network.target docker.socket
+Requires=docker.socket
+
+[Service]
+EnvironmentFile=/etc/sysconfig/docker
+ExecStart=/usr/bin/docker -d -H fd:// $DOCKER_OPTS
+MountFlags=slave
+LimitNOFILE=1048576
+LimitNPROC=1048576
+LimitCORE=infinity
+
+[Install]
+WantedBy=multi-user.target
+

docker.socket

@@ -1,5 +1,6 @@
 [Unit]
 Description=Docker Socket for the API
+PartOf=docker.service
 
 [Socket]
 ListenStream=/var/run/docker.sock

docker.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package docker
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -60,7 +60,7 @@ Requires:       xz >= 4.9
 Conflicts:      lxc < 1.0
 PreReq:         %fillup_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch:  x86_64
+ExclusiveArch:  armv7hl x86_64
 
 %description
 Docker complements LXC with a high-level API which operates at the process
@@ -98,8 +98,6 @@ Zsh command line completion support for %{name}.
 cp %{SOURCE7} .
 
 %build
-%{go_disable_brp_strip_static_archive}
-
 export AUTO_GOPATH=1
 export DOCKER_BUILDTAGS="exclude_graphdriver_aufs apparmor selinux"
 export DOCKER_GITCOMMIT=%{git_version}