[arch-commits] Commit in docker/repos/community-x86_64 (5 files)
Sébastien Luttringer
seblu at archlinux.org
Sat Jul 26 15:08:54 UTC 2014
Date: Saturday, July 26, 2014 @ 17:08:54
Author: seblu
Revision: 116379
archrelease: copy trunk to community-x86_64
Added:
docker/repos/community-x86_64/PKGBUILD
(from rev 116378, docker/trunk/PKGBUILD)
docker/repos/community-x86_64/docker.install
(from rev 116378, docker/trunk/docker.install)
docker/repos/community-x86_64/docker.service
(from rev 116378, docker/trunk/docker.service)
Deleted:
docker/repos/community-x86_64/PKGBUILD
docker/repos/community-x86_64/docker.install
----------------+
PKGBUILD | 109 ++++++++++++++++++++++++++++---------------------------
docker.install | 47 +++++++++--------------
docker.service | 13 ++++++
3 files changed, 87 insertions(+), 82 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-07-26 15:08:42 UTC (rev 116378)
+++ PKGBUILD 2014-07-26 15:08:54 UTC (rev 116379)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer
-
-pkgname=docker
-pkgver=1.1.2
-pkgrel=1
-epoch=1
-pkgdesc='Pack, ship and run any application as a lightweight container'
-arch=('x86_64')
-url='http://www.docker.io/'
-license=('Apache')
-depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
-makedepends=('git' 'go' 'btrfs-progs')
-optdepends=('btrfs-progs: btrfs backend support'
- 'lxc: lxc backend support')
-# don't strip binaries! A sha1 is used to check binary consistency.
-options=('!strip')
-install=$pkgname.install
-source=("git+https://github.com/docker/docker.git#tag=v$pkgver")
-md5sums=('SKIP')
-
-build() {
- cd docker
- export AUTO_GOPATH=1
- ./hack/make.sh dynbinary
-}
-
-#check() {
-# cd "$_magic/docker"
-# # Will be added upstream soon
-# ./hack/make.sh dyntest
-#}
-
-package() {
- cd 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 'contrib/init/systemd/socket-activation/docker.service' \
- "$pkgdir/usr/lib/systemd/system/docker.service"
- install -Dm644 'contrib/init/systemd/socket-activation/docker.socket' \
- "$pkgdir/usr/lib/systemd/system/docker.socket"
- # vim syntax
- install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \
- "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim"
- install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' \
- "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: docker/repos/community-x86_64/PKGBUILD (from rev 116378, docker/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-07-26 15:08:54 UTC (rev 116379)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+
+pkgname=docker
+pkgver=1.1.2
+pkgrel=2
+epoch=1
+pkgdesc='Pack, ship and run any application as a lightweight container'
+arch=('x86_64')
+url='http://www.docker.io/'
+license=('Apache')
+depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
+makedepends=('git' 'go' 'btrfs-progs')
+optdepends=('btrfs-progs: btrfs backend support'
+ 'lxc: lxc backend support')
+# don't strip binaries! A sha1 is used to check binary consistency.
+options=('!strip')
+install=$pkgname.install
+source=("git+https://github.com/docker/docker.git#tag=v$pkgver"
+ 'docker.service')
+md5sums=('SKIP'
+ 'aea0c57d458e3fc313107a76745c96bb')
+
+build() {
+ cd docker
+ export AUTO_GOPATH=1
+ ./hack/make.sh dynbinary
+}
+
+#check() {
+# cd "$_magic/docker"
+# # Will be added upstream soon
+# ./hack/make.sh dyntest
+#}
+
+package() {
+ cd 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 'contrib/init/systemd/socket-activation/docker.service' \
+ install -Dm644 "$srcdir/docker.service" \
+ "$pkgdir/usr/lib/systemd/system/docker.service"
+ install -Dm644 'contrib/init/systemd/socket-activation/docker.socket' \
+ "$pkgdir/usr/lib/systemd/system/docker.socket"
+ # vim syntax
+ install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \
+ "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim"
+ install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' \
+ "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: docker.install
===================================================================
--- docker.install 2014-07-26 15:08:42 UTC (rev 116378)
+++ docker.install 2014-07-26 15:08:54 UTC (rev 116379)
@@ -1,29 +0,0 @@
-# arg 1: the new package version
-post_install() {
- # create docker group (FS#38029)
- getent group docker >/dev/null || groupadd -g 142 docker
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- (( $(vercmp $2 '1:0.7.1-1') < 0 )) && post_install "$1" || true
- (( $(vercmp $2 '1:1.1.1-2') < 0 )) && socketactivation || true
-}
-
-# arg 1: the old package version
-post_remove() {
- groupdel docker >/dev/null 2>&1 || true
-}
-
-socketactivation() {
- if systemctl -q is-enabled docker; then
- cat << EOF
-The docker service switched to socket activation.
-We will enable the socket file for you. Don't need to thanks us.
-EOF
- systemctl enable docker.socket
- fi
-}
-
-# vim:set ts=2 sw=2 et:
Copied: docker/repos/community-x86_64/docker.install (from rev 116378, docker/trunk/docker.install)
===================================================================
--- docker.install (rev 0)
+++ docker.install 2014-07-26 15:08:54 UTC (rev 116379)
@@ -0,0 +1,18 @@
+# arg 1: the new package version
+post_install() {
+ # create docker group (FS#38029)
+ getent group docker >/dev/null || groupadd -g 142 docker
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ (( $(vercmp $2 '1:0.7.1-1') < 0 )) && post_install "$1" || true
+}
+
+# arg 1: the old package version
+post_remove() {
+ groupdel docker >/dev/null 2>&1 || true
+}
+
+# vim:set ts=2 sw=2 et:
Copied: docker/repos/community-x86_64/docker.service (from rev 116378, docker/trunk/docker.service)
===================================================================
--- docker.service (rev 0)
+++ docker.service 2014-07-26 15:08:54 UTC (rev 116379)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.com
+After=network.target docker.socket
+Requires=docker.socket
+
+[Service]
+ExecStart=/usr/bin/docker -d -H fd://
+LimitNOFILE=1048576
+LimitNPROC=1048576
+
+[Install]
+Also=docker.socket
More information about the arch-commits
mailing list