minor fixes

master
Michał 'rysiek' Woźniak 2015-01-04 00:27:52 +01:00
parent dd20972fc6
commit 36e5ff5b0f
1 changed files with 18 additions and 11 deletions

View File

@ -31,6 +31,20 @@ killall="docker kill $quassel_container $postgres_container"
# remove all
rmall="docker rm -v $quassel_container $postgres_container"
# info
info="remember to prep the postgres environment if needed:
- docker run --entrypoint /bin/sh -u root -t -i -v $postgresdata:/var/lib/postgresql/ --rm $postgres_image -c /root/prep.sh
- docker run --entrypoint /bin/sh -u root -t -i -v $quasselconf:/var/lib/quassel/quasselcore.conf --name $quassel_container --rm $quassel_image -c 'chown quasselcore:quassel /var/lib/quassel/quasselcore.conf'
root access to both containers:
- docker run --entrypoint /bin/sh -u root -h $postgres_container -t -i --name $postgres_container --rm $postgres_image -c /bin/bash
- docker run --entrypoint /bin/sh -u root -h $quassel_container --link=$postgres_container:$postgres_container -t -i -v $quasselconf:/var/lib/quassel/quasselcore.conf --name $quassel_container --rm $quassel_image -c /bin/bash"
# info
if [[ "$1" == "--info" ]]; then
echo "$info"
fi
# do we want to build stuff?
if [[ "$1" == "--build" ]]; then
echo "
@ -52,22 +66,15 @@ if [[ "$1" == "--build" ]]; then
echo "
all built. remember to prep the postgres environment if needed:
- docker run --entrypoint /bin/sh -u root -t -i -v $postgresdata:/var/lib/postgresql/ --rm $postgres_image -c /root/prep.sh
- docker run --entrypoint /bin/ss -u root -t -i -v $quasselconf:/var/lib/quassel/quasselcore.conf --name $quassel_container --rm $quassel_image -c chown quasselcore:quassel /var/lib/quassel/quasselcore.conf
root access to both containers:
- docker run --entrypoint /bin/sh -u root -h $postgres_container -t -i --name $postgres_container --rm $postgres_image -c /bin/bash
- docker run --entrypoint /bin/sh -u root -h $quassel_container --link=$postgres_container:$postgres_container -t -i -v $quasselconf:/var/lib/quassel/quasselcore.conf --name $quassel_container --rm $quassel_image -c /bin/bash
"
all built. $info"
fi
# do we want to clean stuff up?
if [[ "$1" == "" || "$1" == "--clean-up" ]]; then
# do we want to kill all quassel-related dockers?
if [[ "$1" == "" || "$1" == "--kill" ]]; then
echo "
cleaning up
killing quassel-related dockers
will run:
- $killall