Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

add --auto and --nolog options to install and upgrade commands #101

Merged
merged 1 commit into from
Dec 19, 2019
Merged

add --auto and --nolog options to install and upgrade commands #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions docker/my-dojo/dojo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,19 @@ install() {

launchInstall=1

if [ -z "$1" ]; then
if [ "$1" = "--auto" ]; then
launchInstall=0
else
get_confirmation
launchInstall=$?
else
launchInstall=0
fi

if [ $launchInstall -eq 0 ]; then
init_config_files
docker_up --remove-orphans
logs
if [ "$1" != "--nolog" ]; then
logs
fi
fi
}

Expand Down Expand Up @@ -144,11 +146,11 @@ upgrade() {

launchUpgrade=1

if [ -z "$1" ]; then
if [ "$1" = "--auto" ]; then
launchUpgrade=0
else
get_confirmation
launchUpgrade=$?
else
launchUpgrade=0
fi

if [ $launchUpgrade -eq 0 ]; then
Expand All @@ -160,7 +162,9 @@ upgrade() {
eval "docker-compose $yamlFiles build --no-cache"
docker_up --remove-orphans
update_dojo_db
logs
if [ "$1" != "--nolog" ]; then
logs
fi
fi
}

Expand Down