docker: removed systemd support + generalized runit

This commit is contained in:
Andrea Brancaleoni 2015-06-05 21:54:53 +02:00
parent 832701c0ca
commit 7cd4530605
2 changed files with 4 additions and 7 deletions

View File

@ -1,3 +1,4 @@
#!/bin/sh #!/bin/sh
[ -r conf ] && . ./conf
modprobe -q loop || exit 1 modprobe -q loop || exit 1
exec chpst -o 1048576 -p 1048576 docker -d 2>/dev/null exec chpst -o 1048576 -p 1048576 docker -d $OPTS 2>/dev/null

View File

@ -1,10 +1,10 @@
# Template file for 'docker' # Template file for 'docker'
pkgname=docker pkgname=docker
version=1.6.2 version=1.6.2
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="Easily create lightweight, portable, self-sufficient containers from any application" short_desc="Pack, ship and run any application as a lightweight container"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Apache-2.0" license="Apache-2.0"
homepage="http://www.docker.io" homepage="http://www.docker.io"
@ -12,7 +12,6 @@ system_groups="docker"
# These are required at run-time. # These are required at run-time.
depends="iptables xz git" depends="iptables xz git"
build_options="systemd"
nostrip=yes nostrip=yes
nocross=yes nocross=yes
@ -28,8 +27,5 @@ do_install() {
vinstall bundles/${version}/dynbinary/dockerinit-${version} 755 usr/lib/docker dockerinit vinstall bundles/${version}/dynbinary/dockerinit-${version} 755 usr/lib/docker dockerinit
vinstall contrib/completion/bash/docker 644 usr/share/bash-completion/completions vinstall contrib/completion/bash/docker 644 usr/share/bash-completion/completions
vinstall contrib/completion/zsh/_docker 644 usr/share/zsh/site-functions vinstall contrib/completion/zsh/_docker 644 usr/share/zsh/site-functions
if [ "$build_option_systemd" ]; then
vinstall contrib/init/systemd/docker.service 644 usr/lib/systemd/system
fi
vsv docker vsv docker
} }