[enh] start dockerd daemon if needed

This commit is contained in:
zamentur 2016-01-31 00:03:56 +01:00
parent 0f50d2ed37
commit ea7645f99d

25
ynh-dev
View file

@ -50,12 +50,19 @@ check_yunohost_vm() {
fi fi
} }
start_dockerd() {
status=`sudo service docker status`
if [ "$status" = "docker stop/waiting" ]; then
sudo service docker start
fi
}
paquets=${@:2} paquets=${@:2}
if [ "$#" = "1" ]; then if [ "$#" = "1" ]; then
paquets=('moulinette' 'ssowat' 'yunohost' 'yunohost-admin') paquets=('moulinette' 'ssowat' 'yunohost' 'yunohost-admin')
fi fi
BASE_DIR=/yunohost BASE_DIR=./
if [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "help" ]; then if [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "help" ]; then
usage usage
@ -78,10 +85,17 @@ elif [ "$1" = "create-env" ]; then
elif [ "$1" = "run" ]; then elif [ "$1" = "run" ]; then
#Run a vm and give a prompt #Run a vm and give a prompt
DOMAIN=$2 DOMAIN=$2
VM=$3 VM='docker'
VERSION=$4 VERSION='stable8'
if [ "$#" = "3" ]; then
VM=$3
elif [ "$#" = "4" ]; then
VM=$3
VERSION=$4
fi
if [ "$VM" = "docker" ]; then if [ "$VM" = "docker" ]; then
start_dockerd
docker exec -t -i $(sudo docker run -h yunohost.$DOMAIN -v $(pwd):/yunohost -d zamentur/yunohost-$VERSION /sbin/init) /bin/bash docker exec -t -i $(sudo docker run -h yunohost.$DOMAIN -v $(pwd):/yunohost -d zamentur/yunohost-$VERSION /sbin/init) /bin/bash
elif [ "$VM" = "virtualbox" ] || [ "$VM" = "vagrant" ]; then elif [ "$VM" = "virtualbox" ] || [ "$VM" = "vagrant" ]; then
vagrant up $VERSION vagrant up $VERSION
@ -97,6 +111,9 @@ elif [ "$1" = "kill" ]; then
docker kill $(docker ps -lq) docker kill $(docker ps -lq)
elif [ "$VM" = "virtualbox" ] || [ "$VM" = "vagrant" ]; then elif [ "$VM" = "virtualbox" ] || [ "$VM" = "vagrant" ]; then
vagrant destroy vagrant destroy
elif [ "$VM" = "" ]; then
vagrant destroy -f
docker kill $(docker ps -lq)
else else
echo "This kind of VM is not supported" echo "This kind of VM is not supported"
exit 100; exit 100;
@ -131,7 +148,7 @@ elif [ "$1" = "deploy" ]; then
;; ;;
yunohost) yunohost)
# Install yunohost # Install yunohost
cat ./yunohost/debian/install | awk '{print "mkdir -p " $2}' | source /dev/stdin cat $BASE_DIR/yunohost/debian/install | awk '{print "mkdir -p " $2}' | source /dev/stdin
sed "s@^@cp -Rf $BASE_DIR/yunohost/@" $BASE_DIR/yunohost/debian/install | source /dev/stdin sed "s@^@cp -Rf $BASE_DIR/yunohost/@" $BASE_DIR/yunohost/debian/install | source /dev/stdin
service yunohost-api restart || echo 'Fail to restart yunohost-api' service yunohost-api restart || echo 'Fail to restart yunohost-api'
echo "yunohost deployed" echo "yunohost deployed"