Minor script fixes

This commit is contained in:
Jan Tuomi
2017-04-06 19:13:18 +03:00
parent c37aca50bd
commit d028612d55
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -14,7 +14,7 @@ then
curl -fsSL https://get.docker.com/ | sh
fi
systemctl status docker.service || { echo "Docker daemon is not running. Please start it!"; exit 1; }
systemctl status docker.service >/dev/null || { echo "Docker daemon is not running. Please start it!"; exit 1; }
echo "Checking if docker-compose is installed..."
docker-compose --version
@@ -39,7 +39,7 @@ echo "Importing database settings..."
docker-compose -p "$PROJECT" exec -T db sh /db/install.sh || { echo "Failed to import database settings!"; exit 1; }
echo "Shutting down db container..."
docker-compose -p "$PROJECT" down db
docker-compose down db
echo "Copying settings..."
cp sikweb/settings-docker-sample.py sikweb/settings.py || { echo "Failed to copy settings!"; exit 1; }
@@ -17,4 +17,4 @@ class Command(BaseCommand):
u.is_staff = True
u.save()
self.stdout.write("Created default user {} with password {}.".format(user_name, password))
self.stdout.write("Created default user {} with password {}.".format(self.user_name, self.password))