diff --git a/Scripts/run.local.sh b/Scripts/run.local.sh index 0f84d92..f74dcc9 100644 --- a/Scripts/run.local.sh +++ b/Scripts/run.local.sh @@ -4,11 +4,11 @@ app="liquors-quiz" release="latest" composefile="docker-compose.local.yml" -# Get the directory containing the script +# Get and move to the directory containing the script dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # Fetch newer images -docker compose pull +docker compose -f $composefile pull # Start app instance docker compose -f $composefile up --force-recreate \ No newline at end of file diff --git a/Scripts/run.sh b/Scripts/run.sh index dd2a40d..495c998 100644 --- a/Scripts/run.sh +++ b/Scripts/run.sh @@ -1,7 +1,14 @@ -# Get the directory containing the script +# Define constant image details +user="dleclercpro" +app="liquors-quiz" +release="latest" +composefile="docker-compose.yml" + +# Get and move to the directory containing the script dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -# Move to the root directory -cd "${dir}/.." +# Fetch newer images +docker compose -f $composefile pull -docker compose up --build \ No newline at end of file +# Start app instance +docker compose -f $composefile up --force-recreate \ No newline at end of file diff --git a/docker-compose.local.yml b/docker-compose.local.yml index 2f59664..1701cca 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -16,8 +16,8 @@ services: image: redis:latest container_name: liquors-quiz-redis volumes: - - data:/data + - redis:/data volumes: - data: \ No newline at end of file + redis: \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 12b55cf..979a70b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: container_name: liquors-quiz-nginx image: dleclercpro/ssl-reverse-proxy:latest restart: always - ports: + ports: # Comment out when getting SSL certs for the first time - 443:443 # HTTPS - 80:80 # HTTP networks: