Merge branch 'main' of https://github.com/Nilstrieb/vps into main

This commit is contained in:
nora 2022-09-10 21:33:24 +02:00
commit cbee61365e
4 changed files with 18 additions and 10 deletions

View file

@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eu pipefail
./docker/setup_net.sh ./docker/setup_net.sh

View file

@ -1,16 +1,17 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eu pipefail
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
if [ "$STAGE" = "localhost" ] ; if [ "${STAGE-}" = "prod" ] ;
then then
echo "INFO Running on localhost"
NGINX_CONF="nginx.local.conf"
EXTRA_ARGS="-p 80:80"
else
echo "INFO Running on prod" echo "INFO Running on prod"
NGINX_CONF="nginx.conf" NGINX_CONF="nginx.conf"
EXTRA_ARGS="-v=/etc/letsencrypt:/etc/nginx/certs -p 443:443" 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 fi
if docker container inspect nginx > /dev/null 2>&1 ; if docker container inspect nginx > /dev/null 2>&1 ;

View file

@ -1,12 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eu pipefail
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
if [ "$STAGE" = "localhost" ] ; if [ "${STAGE-}" = "prod" ] ;
then then
echo "INFO Running on localhost"
CERT_VOLUME=""
else
echo "INFO Running on prod" echo "INFO Running on prod"
CERT_VOLUME="\ CERT_VOLUME="\
-v=/etc/letsencrypt:/etc/letsencrypt \ -v=/etc/letsencrypt:/etc/letsencrypt \
@ -17,6 +15,9 @@ else
-e=REGISTRY_AUTH_HTPASSWD_REALM=Realm \ -e=REGISTRY_AUTH_HTPASSWD_REALM=Realm \
-e=REGISTRY_AUTH_HTPASSWD_PATH=/htpasswd \ -e=REGISTRY_AUTH_HTPASSWD_PATH=/htpasswd \
" "
else
echo "INFO Running on localhost"
CERT_VOLUME=""
fi fi
if docker container inspect registry > /dev/null 2>&1 ; if docker container inspect registry > /dev/null 2>&1 ;

View file

@ -1,3 +1,5 @@
set -eu pipefail
# frontend # frontend
docker run --net internal --name cors-school-frontend -d --restart=always docker.nilstrieb.dev/cors-school-frontend:1.0.0 docker run --net internal --name cors-school-frontend -d --restart=always docker.nilstrieb.dev/cors-school-frontend:1.0.0
@ -5,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 docker run --net internal -d --name cors-postgres -e POSTGRES_PASSWORD=hugo58hugo -e POSTGRES_DB=davinci postgres
# backend # 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 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