[arch-commits] Commit in docker/trunk (PKGBUILD docker.install docker.sysusers)
Date: Thursday, January 12, 2017 @ 10:54:56
Author: seblu
Revision: 206979
upgpkg: docker 1:1.12.6-1
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.sysusers
Deleted:
docker/trunk/docker.install
-+
PKGBUILD|5 ++---
docker.install | 13 -
docker.sysusers |1 +
3 files changed, 3 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-01-12 10:50:29 UTC (rev 206978)
+++ PKGBUILD2017-01-12 10:54:56 UTC (rev 206979)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.12.5
+pkgver=1.12.6
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -15,7 +15,6 @@
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip')
-install=$pkgname.install
# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
source=("git+https://github.com/docker/docker.git#tag=v$pkgver;
@@ -25,7 +24,7 @@
md5sums=('SKIP'
'SKIP'
'SKIP'
- '8cf9900ebada61f352a03465a088da34')
+ '9a8b2744db23b14ca3cd350fdf73c179')
prepare() {
cd docker
Deleted: docker.install
===
--- docker.install 2017-01-12 10:50:29 UTC (rev 206978)
+++ docker.install 2017-01-12 10:54:56 UTC (rev 206979)
@@ -1,13 +0,0 @@
-# Arg 1: the new package version
-post_install() {
- # create docker group (FS#38029)
- systemd-sysusers docker.conf
-}
-
-# 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
-}
-
-# vim:set ts=2 sw=2 et:
Modified: docker.sysusers
===
--- docker.sysusers 2017-01-12 10:50:29 UTC (rev 206978)
+++ docker.sysusers 2017-01-12 10:54:56 UTC (rev 206979)
@@ -1 +1,2 @@
+# create docker group (FS#38029)
g docker - -
[arch-commits] Commit in docker/trunk (PKGBUILD docker.install docker.sysusers)
Date: Friday, May 8, 2015 @ 12:35:33
Author: seblu
Revision: 132956
upgpkg: docker 1:1.6.1-1
Added:
docker/trunk/docker.sysusers
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.install
-+
PKGBUILD| 21 ++---
docker.install |9 ++---
docker.sysusers |1 +
3 files changed, 13 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-08 10:27:12 UTC (rev 132955)
+++ PKGBUILD2015-05-08 10:35:33 UTC (rev 132956)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien Seblu Luttringer
pkgname=docker
-pkgver=1.6.0
+pkgver=1.6.1
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -16,8 +16,10 @@
# 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')
+source=(git+https://github.com/docker/docker.git#tag=v$pkgver;
+$pkgname.sysusers)
+md5sums=('SKIP'
+ '4324edeb9adc210a2c22f44eb4cb8a74')
build() {
cd docker
@@ -40,15 +42,12 @@
install -Dm644 'contrib/completion/zsh/_docker'
$pkgdir/usr/share/zsh/site-functions/_docker
install -Dm644 'contrib/completion/fish/docker.fish'
$pkgdir/usr/share/fish/completions/docker.fish
# systemd
- install -Dm644 'contrib/init/systemd/docker.service' \
-$pkgdir/usr/lib/systemd/system/docker.service
- install -Dm644 'contrib/init/systemd/docker.socket' \
-$pkgdir/usr/lib/systemd/system/docker.socket
+ install -Dm644 'contrib/init/systemd/docker.service'
$pkgdir/usr/lib/systemd/system/docker.service
+ install -Dm644 'contrib/init/systemd/docker.socket'
$pkgdir/usr/lib/systemd/system/docker.socket
+ install -Dm644 $srcdir/$pkgname.sysusers
$pkgdir/usr/lib/sysusers.d/$pkgname.conf
# 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
+ 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:
Modified: docker.install
===
--- docker.install 2015-05-08 10:27:12 UTC (rev 132955)
+++ docker.install 2015-05-08 10:35:33 UTC (rev 132956)
@@ -1,7 +1,7 @@
-# arg 1: the new package version
+# Arg 1: the new package version
post_install() {
# create docker group (FS#38029)
- getent group docker /dev/null || groupadd -g 142 docker
+ systemd-sysusers docker.conf
}
# arg 1: the new package version
@@ -10,9 +10,4 @@
(( $(vercmp $2 '1:0.7.1-1') 0 )) post_install $1 || true
}
-# arg 1: the old package version
-post_remove() {
- groupdel docker /dev/null 21 || true
-}
-
# vim:set ts=2 sw=2 et:
Added: docker.sysusers
===
--- docker.sysusers (rev 0)
+++ docker.sysusers 2015-05-08 10:35:33 UTC (rev 132956)
@@ -0,0 +1 @@
+g docker 2 -
[arch-commits] Commit in docker/trunk (PKGBUILD docker.install docker.service)
Date: Saturday, July 26, 2014 @ 17:08:42
Author: seblu
Revision: 116378
upgpkg: docker 1:1.1.2-2
- fix FS#41338
- remove no more needed transition message
Added:
docker/trunk/docker.service
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.install
+
PKGBUILD | 11 +++
docker.install | 11 ---
docker.service | 13 +
3 files changed, 20 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-26 14:48:46 UTC (rev 116377)
+++ PKGBUILD2014-07-26 15:08:42 UTC (rev 116378)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.1.2
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -16,8 +16,10 @@
# 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')
+source=(git+https://github.com/docker/docker.git#tag=v$pkgver;
+'docker.service')
+md5sums=('SKIP'
+ 'aea0c57d458e3fc313107a76745c96bb')
build() {
cd docker
@@ -39,7 +41,8 @@
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 '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
Modified: docker.install
===
--- docker.install 2014-07-26 14:48:46 UTC (rev 116377)
+++ docker.install 2014-07-26 15:08:42 UTC (rev 116378)
@@ -8,7 +8,6 @@
# 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
@@ -16,14 +15,4 @@
groupdel docker /dev/null 21 || 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:
Added: docker.service
===
--- docker.service (rev 0)
+++ docker.service 2014-07-26 15:08:42 UTC (rev 116378)
@@ -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
[arch-commits] Commit in docker/trunk (PKGBUILD docker.install)
Date: Wednesday, July 23, 2014 @ 01:32:13
Author: seblu
Revision: 116129
fix FS#41289
implement FS#40847
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.install
+
PKGBUILD | 13 +
docker.install | 11 +++
2 files changed, 20 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-22 23:16:12 UTC (rev 116128)
+++ PKGBUILD2014-07-22 23:32:13 UTC (rev 116129)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.1.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -39,10 +39,15 @@
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/docker.service'
$pkgdir/usr/lib/systemd/system/docker.service
+ 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/dockerfile.vim
+ 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:
Modified: docker.install
===
--- docker.install 2014-07-22 23:16:12 UTC (rev 116128)
+++ docker.install 2014-07-22 23:32:13 UTC (rev 116129)
@@ -8,6 +8,7 @@
# 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
@@ -15,4 +16,14 @@
groupdel docker /dev/null 21 || 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:
