From db98951d7cb8910a4719daf72a22f2243e21d75e Mon Sep 17 00:00:00 2001 From: nils <48135649+Nilstrieb@users.noreply.github.com> Date: Tue, 6 Sep 2022 12:57:25 +0200 Subject: [PATCH 1/3] invert stage --- nginx/run.sh | 11 ++++++----- registry/run.sh | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/nginx/run.sh b/nginx/run.sh index 6ed31f3..04146f6 100755 --- a/nginx/run.sh +++ b/nginx/run.sh @@ -1,16 +1,17 @@ #!/usr/bin/env bash +set -eu pipefail SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -if [ "$STAGE" = "localhost" ] ; +if [ "${STAGE-}" = "prod" ] ; then - echo "INFO Running on localhost" - NGINX_CONF="nginx.local.conf" - EXTRA_ARGS="-p 80:80" -else echo "INFO Running on prod" NGINX_CONF="nginx.conf" EXTRA_ARGS="-v=/etc/letsencrypt:/etc/nginx/certs -p 443:443" +else + echo "INFO Running on localhost" + NGINX_CONF="nginx.local.conf" + EXTRA_ARGS="-p 80:80" fi if docker container inspect nginx > /dev/null 2>&1 ; diff --git a/registry/run.sh b/registry/run.sh index 4e7be6f..ad1db06 100755 --- a/registry/run.sh +++ b/registry/run.sh @@ -1,12 +1,10 @@ #!/usr/bin/env bash +set -eu pipefail SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -if [ "$STAGE" = "localhost" ] ; +if [ "${STAGE-}" = "prod" ] ; then - echo "INFO Running on localhost" - CERT_VOLUME="" -else echo "INFO Running on prod" CERT_VOLUME="\ -v=/etc/letsencrypt:/etc/letsencrypt \ @@ -17,6 +15,9 @@ else -e=REGISTRY_AUTH_HTPASSWD_REALM=Realm \ -e=REGISTRY_AUTH_HTPASSWD_PATH=/htpasswd \ " +else + echo "INFO Running on localhost" + CERT_VOLUME="" fi if docker container inspect registry > /dev/null 2>&1 ; From 7db6a0a6bcb0379443c236443304290290245e35 Mon Sep 17 00:00:00 2001 From: nils <48135649+Nilstrieb@users.noreply.github.com> Date: Tue, 6 Sep 2022 12:57:57 +0200 Subject: [PATCH 2/3] eu pipefile --- full_setup.sh | 1 + run_scripts/cors-school.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/full_setup.sh b/full_setup.sh index 5e361bf..d370cd3 100755 --- a/full_setup.sh +++ b/full_setup.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -eu pipefail ./docker/setup_net.sh diff --git a/run_scripts/cors-school.sh b/run_scripts/cors-school.sh index 54bd28b..a14ac03 100644 --- a/run_scripts/cors-school.sh +++ b/run_scripts/cors-school.sh @@ -1,3 +1,5 @@ +set -eu pipefail + # frontend docker run --net internal --name cors-school-frontend -d --restart=always docker.nilstrieb.dev/cors-school-frontend:1.0.0 From 378bc3e8f22a413a49faa6b46733ebc852ef96f9 Mon Sep 17 00:00:00 2001 From: nils <48135649+Nilstrieb@users.noreply.github.com> Date: Tue, 6 Sep 2022 16:34:19 +0200 Subject: [PATCH 3/3] bot run --- run_scripts/cors-school.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run_scripts/cors-school.sh b/run_scripts/cors-school.sh index a14ac03..77c47d0 100644 --- a/run_scripts/cors-school.sh +++ b/run_scripts/cors-school.sh @@ -7,4 +7,7 @@ docker run --net internal --name cors-school-frontend -d --restart=always docker docker run --net internal -d --name cors-postgres -e POSTGRES_PASSWORD=hugo58hugo -e POSTGRES_DB=davinci postgres # backend -docker run --net internal -d --name cors-school-backend -e DATABASE_URL=postgres://postgres:hugo58hugo@cors-postgres/davinci -e RUST_LOG=info -e JWT_SECRET='redacted' docker.nilstrieb.dev/cors-school-backend:1.0 \ No newline at end of file +docker run --net internal -d --name cors-school-backend -e DATABASE_URL=postgres://postgres:hugo58hugo@cors-postgres/davinci -e RUST_LOG=info -e JWT_SECRET='redacted' docker.nilstrieb.dev/cors-school-backend:1.0 + +# bot +docker run --net internal -d --name cors-school-bot -v "$(pwd)/env:/.env" docker.nilstrieb.dev/cors-school-bot:1.0 \ No newline at end of file