diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | docker.service | 2 |
4 files changed, 18 insertions, 15 deletions
@@ -1,6 +1,6 @@ -pkgbase = docker-rootless +pkgbase = docker-rootless-bin pkgdesc = Run the Docker daemon as a non-root user (Rootless mode) - pkgver = 19.03.11 + pkgver = 19.03.12 pkgrel = 1 url = https://docs.docker.com/engine/security/rootless/ install = docker-rootless.install @@ -8,12 +8,13 @@ pkgbase = docker-rootless license = Apache depends = docker provides = docker-rootless - source = https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.11.tgz + conflicts = docker-rootless + source = https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.12.tgz source = docker.service - md5sums = 6be4fdae6e2bd2d4c627fd162226667a - md5sums = c5158588c36fc80cf85835258f8cd345 - sha256sums = b21ee1469f5b4b3e2a20af5c0f90d7a95c9130b462fbef3808359f2f6767803f - sha256sums = eefe4eaa55184c396f929a2436a22af97130c6e7f8791a79582902dea7c4cd9b + md5sums = 90add09c07b8c2291b93e3fd6c3da0ed + md5sums = 04425cca4e95bf534c41697aeabfcad4 + sha256sums = 7b66da2c8ba6c0b04bfb054327f229ac82aa98c827b747693822f45ffd01e5de + sha256sums = edf633c42d27e039d5acbb1ead685d6acd66b06786a8552e1bbe5f789dc2c315 -pkgname = docker-rootless +pkgname = docker-rootless-bin diff --git a/.gitignore b/.gitignore index 1d1b73b03d7b..014c90f64242 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +mk_pkgbuild.rb docker-rootless-* src pkg @@ -1,6 +1,6 @@ # Maintainer: PastLeo <chgu82837@gmail.com> -pkgname=docker-rootless -pkgver=19.03.11 +pkgname=docker-rootless-bin +pkgver=19.03.12 pkgrel=1 pkgdesc="Run the Docker daemon as a non-root user (Rootless mode)" arch=('x86_64') @@ -8,6 +8,7 @@ url="https://docs.docker.com/engine/security/rootless/" license=('Apache') depends=('docker') provides=('docker-rootless') +conflicts=('docker-rootless') install=docker-rootless.install source=( "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-$pkgver.tgz" @@ -15,13 +16,13 @@ source=( ) md5sums=( - "6be4fdae6e2bd2d4c627fd162226667a" - "c5158588c36fc80cf85835258f8cd345" + "90add09c07b8c2291b93e3fd6c3da0ed" + "04425cca4e95bf534c41697aeabfcad4" ) sha256sums=( - "b21ee1469f5b4b3e2a20af5c0f90d7a95c9130b462fbef3808359f2f6767803f" - "eefe4eaa55184c396f929a2436a22af97130c6e7f8791a79582902dea7c4cd9b" + "7b66da2c8ba6c0b04bfb054327f229ac82aa98c827b747693822f45ffd01e5de" + "edf633c42d27e039d5acbb1ead685d6acd66b06786a8552e1bbe5f789dc2c315" ) package() { diff --git a/docker.service b/docker.service index 3eef75540a7f..952c8d56685d 100644 --- a/docker.service +++ b/docker.service @@ -4,7 +4,7 @@ Documentation=https://docs.docker.com [Service] Environment=PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -Environment=DOCKERD_FLAGS="--experimental --storage-driver=vfs" +Environment=DOCKERD_FLAGS="--experimental" ExecStart=/usr/bin/dockerd-rootless.sh $DOCKERD_FLAGS ExecReload=/bin/kill -s HUP $MAINPID TimeoutSec=0 |