docker: Improved rc script and default configuration

This commit is contained in:
James Mills 2014-11-22 10:28:51 +10:00
parent bbb967642d
commit 9355a877a6
4 changed files with 11 additions and 7 deletions

View File

@ -1,4 +1,4 @@
d5e8ec779bb6e49cc6a44781f85d98b7 check-config.sh
966e1916d611427c44686ad09145996f docker.conf
139afe9c85732d52148035d62810b938 docker.rc
849b268387b3a23ce4e0b0bdf0c342d4 docker
5a4c44dc046f863f60bba02080d66fd1 docker.conf
098c366f9c8eb82ba537b93eec66303e v1.3.1.tar.gz

View File

@ -1,5 +1,5 @@
# Description: Pack, ship and run any application as a lightweight container
# URL: http://www.docker.io/
# URL: http://www.docker.com/
# Maintainer: James Mills, prologic at shortcircuit dot net dot au
#
# Depends on: go sqlite3 cgroupfs-mount
@ -7,11 +7,11 @@
name=docker
version=1.3.1
revision=4e9bbfa900
release=1
release=2
source=(
https://raw.githubusercontent.com/dotcloud/docker/v${version}/contrib/check-config.sh
https://github.com/dotcloud/$name/archive/v$version.tar.gz
$name.rc
$name
$name.conf
)
@ -35,7 +35,7 @@ build() {
install -D -m 644 "contrib/udev/80-docker.rules" \
"$PKG/etc/udev/rules.d/80-docker.rules"
install -D -m 755 $SRC/$name.rc $PKG/etc/rc.d/$name
install -D -m 755 $SRC/$name $PKG/etc/rc.d/$name
install -D -m 644 $SRC/$name.conf $PKG/etc/$name.conf
chown -R root:root $PKG

View File

@ -3,6 +3,8 @@
# /etc/rc.d/docker: start/stop docker daemon
#
export PATH="/sbin:/usr/sbin:$PATH"
source /etc/docker.conf
case $1 in

View File

@ -1,5 +1,7 @@
# Docker Daemon Configuration
#
# For configuration options see: docker --help
DOCKER_OPTS="-d -p /var/run/docker.pid -H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock"
DOCKER_OPTS="-d -p /var/run/docker.pid"
# vim: syntax=sh