Merge pull request #3541 from nicolasgodinho/master
docker: Fix deprecated daemon option (-d)
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
[ -r conf ] && . ./conf
|
[ -r conf ] && . ./conf
|
||||||
modprobe -q loop || exit 1
|
modprobe -q loop || exit 1
|
||||||
exec chpst -o 1048576 -p 1048576 docker -d $OPTS 2>/dev/null
|
exec chpst -o 1048576 -p 1048576 docker daemon $OPTS 2>/dev/null
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Template file for 'docker'
|
# Template file for 'docker'
|
||||||
pkgname=docker
|
pkgname=docker
|
||||||
version=1.10.0
|
version=1.10.0
|
||||||
revision=1
|
revision=2
|
||||||
hostmakedepends="git go"
|
hostmakedepends="git go"
|
||||||
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel"
|
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel"
|
||||||
short_desc="Pack, ship and run any application as a lightweight container"
|
short_desc="Pack, ship and run any application as a lightweight container"
|
||||||
|
|||||||
Reference in New Issue
Block a user