[arch-commits] Commit in (6 files)

[Sébastien Luttringer]

    Date: Saturday, November 30, 2013 @ 04:51:18
  Author: seblu
Revision: 101667

Add docker (docker.io)

Added:
  docker/
  docker/repos/
  docker/trunk/
  docker/trunk/01-fix-libexec.patch
  docker/trunk/PKGBUILD
  docker/trunk/docker.service

----------------------+
 01-fix-libexec.patch |   19 ++++++++++++++++
 PKGBUILD             |   55 +++++++++++++++++++++++++++++++++++++++++++++++++
 docker.service       |   11 +++++++++
 3 files changed, 85 insertions(+)

Added: docker/trunk/01-fix-libexec.patch
===================================================================
--- docker/trunk/01-fix-libexec.patch	                        (rev 0)
+++ docker/trunk/01-fix-libexec.patch	2013-11-30 03:51:18 UTC (rev 101667)
@@ -0,0 +1,19 @@
+diff --git a/utils/utils.go b/utils/utils.go
+index cfdc73b..becc0dd 100644
+--- a/utils/utils.go
++++ b/utils/utils.go
+@@ -279,9 +279,14 @@ func DockerInitPath(localCopy string) string {
+ 	var possibleInits = []string{
+ 		localCopy,
+ 		filepath.Join(filepath.Dir(selfPath), "dockerinit"),
++
+ 		// "/usr/libexec includes internal binaries that are not intended to be executed directly by users or shell scripts. Applications may use a single subdirectory under /usr/libexec."
+ 		"/usr/libexec/docker/dockerinit",
+ 		"/usr/local/libexec/docker/dockerinit",
++
++		// strict FHS 2.3: "/usr/lib includes object files, libraries, and internal binaries that are not intended to be executed directly by users or shell scripts."
++		"/usr/lib/docker/dockerinit",
++		"/usr/local/lib/docker/dockerinit",
+ 	}
+ 	for _, dockerInit := range possibleInits {
+ 		path, err := exec.LookPath(dockerInit)
\ No newline at end of file

Added: docker/trunk/PKGBUILD
===================================================================
--- docker/trunk/PKGBUILD	                        (rev 0)
+++ docker/trunk/PKGBUILD	2013-11-30 03:51:18 UTC (rev 101667)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+
+pkgname=docker
+pkgver=0.7.0
+pkgrel=1
+epoch=1
+pkgdesc='Pack, ship and run any application as a lightweight container'
+arch=('x86_64' 'i686')
+url='http://www.docker.io/'
+license=('Apache')
+depends=('bridge-utils' 'iproute2' 'device-mapper' 'lxc' 'sqlite' 'systemd')
+makdepends=('git' 'go')
+# don't strip binaries! A sha1 is used to check binary consistency.
+options=('!strip')
+source=("git+https://github.com/dotcloud/docker.git#tag=v$pkgver"
+        'docker.service'
+        '01-fix-libexec.patch')
+md5sums=('SKIP'
+         '3f7ccab915fb1942f06e18946c2811d2'
+         '6684c04dd4697e0cb7aa3f171c96a2e4')
+# magic harcoded path
+_magic=src/github.com/dotcloud
+
+prepare() {
+  mkdir -p "$_magic"
+  ln -sfn "../../../docker" "$_magic/docker"
+  # patch for libexec path waiting 0.7.1
+  patch -p1 -d docker < 01-fix-libexec.patch
+}
+
+build() {
+  cd "$_magic/docker"
+  export GOPATH="$srcdir:$srcdir/$_magic/docker/vendor"
+  ./hack/make.sh dynbinary
+}
+
+check() {
+  cd "$_magic/docker"
+  # Will be added upstream soon
+  #./hack/make.sh dyntest
+}
+
+package() {
+  cd "$_magic/docker"
+  install -Dm755 "bundles/$pkgver/dynbinary/docker-$pkgver" "$pkgdir/usr/bin/docker"
+  install -Dm755 "bundles/$pkgver/dynbinary/dockerinit-$pkgver" "$pkgdir/usr/lib/docker/dockerinit"
+  # completion
+  install -Dm644 "contrib/completion/bash/docker" "$pkgdir/usr/share/bash-completion/completions/docker"
+  install -Dm644 "contrib/completion/zsh/_docker" "$pkgdir/usr/share/zsh/site-functions/_docker"
+  # systemd
+  install -Dm644 "$srcdir/docker.service" "$pkgdir/usr/lib/systemd/system/docker.service"
+}
+
+# vim:set ts=2 sw=2 et:


Property changes on: docker/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: docker/trunk/docker.service
===================================================================
--- docker/trunk/docker.service	                        (rev 0)
+++ docker/trunk/docker.service	2013-11-30 03:51:18 UTC (rev 101667)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.io
+After=network.target
+
+[Service]
+ExecStartPre=/usr/bin/mount --make-rprivate /
+ExecStart=/usr/bin/docker -d
+
+[Install]
+WantedBy=multi-user.target