updated stuff

This commit is contained in:
Nikolas Weger 2019-12-12 16:29:20 +01:00
parent db8cd85bd2
commit 2efe0bd712
12 changed files with 46 additions and 236 deletions

View file

@ -1,7 +1,5 @@
# Docker
_appup_docker () {
if hash docker-compose >/dev/null 2>&1; then
# Check if docker-machine has been started
if hash docker-machine >/dev/null 2>&1; then
if docker-machine status | grep -qi "Stopped"; then
read -q "REPLY?Docker Machine is not running, would you like to start it? [y/n] "
@ -16,7 +14,6 @@ _appup_docker () {
fi
fi
# Check YAML extension
compose_file=''
compose_project_file=''
@ -26,7 +23,6 @@ _appup_docker () {
compose_file='docker-compose.yaml'
fi
# <cmd> <project name> will look for docker-compose.<project name>.yml
if [ -n "$2" ]; then
if [ -e "docker-compose.$2.yml" ]; then
compose_project_file="docker-compose.$2.yml"
@ -35,7 +31,6 @@ _appup_docker () {
fi
if [ -n "$compose_project_file" ]; then
# Override project name from custom env
if [ -e ".env.$2" ]; then
project=$(source ".env.$2"; echo $COMPOSE_PROJECT_NAME)
@ -56,7 +51,6 @@ _appup_docker () {
fi
}
# Vagrant
_appup_vagrant () {
if hash vagrant >/dev/null 2>&1; then
vagrant $1 "${@:2}"