From 0a3be3a5b9bb577db6c692614008847a211660ca Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 30 Oct 2023 18:47:47 +0000 Subject: [PATCH] Updates for smoother deploy, fixing host bug --- api/Makefile | 4 +++- api/README.md | 2 +- api/docker-compose.deploy.yml | 6 ++++-- api/set_envs.sh | 7 +++---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/api/Makefile b/api/Makefile index 7c81c7e63..ca334cad0 100644 --- a/api/Makefile +++ b/api/Makefile @@ -1,3 +1,5 @@ +SHELL := /bin/bash + build: docker compose -f docker-compose.yml -f docker-compose.test.yml build docker compose -f docker-compose.yml -f docker-compose.test.yml pull @@ -6,7 +8,7 @@ api: docker compose -f docker-compose.yml -f docker-compose.develop.yml up deploy: - docker compose build && docker compose -f docker-compose.yml -f docker-compose.deploy.yml up -d + source set_envs.sh && docker compose build && docker compose -f docker-compose.yml -f docker-compose.deploy.yml up -d logs: docker compose -f docker-compose.yml -f docker-compose.deploy.yml logs -f diff --git a/api/README.md b/api/README.md index 13614920a..6c5053b20 100644 --- a/api/README.md +++ b/api/README.md @@ -147,7 +147,7 @@ Specifically, update `info@ovio.org` with a domain admin email and `prism-api.ov To deploy, run: ``` -source set_envs.sh && make deploy +make deploy ``` There are a few known issues happening from time to time diff --git a/api/docker-compose.deploy.yml b/api/docker-compose.deploy.yml index 3626d5084..1b3627f5d 100644 --- a/api/docker-compose.deploy.yml +++ b/api/docker-compose.deploy.yml @@ -18,7 +18,7 @@ services: - "--entrypoints.websecure.address=:443" - "--certificatesresolvers.myresolver.acme.tlschallenge=true" - "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" - - "--certificatesresolvers.myresolver.acme.email=info@ovio.org" + - "--certificatesresolvers.myresolver.acme.email=$INFO_EMAIL" - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" - traefik.docker.network=traefik_default networks: @@ -26,6 +26,8 @@ services: ports: - "443:443" - "8080:8080" + environment: + - INFO_EMAIL=${INFO_EMAIL:?'Must provide info email'} volumes: - "./letsencrypt:/letsencrypt" - "/var/run/docker.sock:/var/run/docker.sock:ro" @@ -40,7 +42,7 @@ services: - "80:80" labels: - "traefik.enable=true" - - "traefik.http.routers.whoami.rule=Host(${HOSTNAME:?'Must provide hostname'})" + - "traefik.http.routers.whoami.rule=Host(`${HOSTNAME:?'Must provide hostname'}`)" - "traefik.http.routers.whoami.entrypoints=websecure" - "traefik.http.routers.whoami.tls.certresolver=myresolver" environment: diff --git a/api/set_envs.sh b/api/set_envs.sh index 96046f3f5..450536e89 100644 --- a/api/set_envs.sh +++ b/api/set_envs.sh @@ -8,16 +8,15 @@ export KOBO_PASSWORD=$(aws secretsmanager get-secret-value --secret-id KOBO_ # PRISM Alerts export PRISM_ALERTS_DATABASE_URL=$(aws secretsmanager get-secret-value --secret-id PRISM_ALERTS_DATABASE_URL | jq .SecretString | jq fromjson | jq -r .PRISM_ALERTS_DATABASE_URL) +export PRISM_ALERTS_EMAIL_USER=$(aws secretsmanager get-secret-value --secret-id PRISM_ALERTS_EMAIL | jq .SecretString | jq fromjson | jq -r .PRISM_ALERTS_EMAIL_USER) +export PRISM_ALERTS_EMAIL_PASSWORD=$(aws secretsmanager get-secret-value --secret-id PRISM_ALERTS_EMAIL | jq .SecretString | jq fromjson | jq -r .PRISM_ALERTS_EMAIL_PASSWORD) # HDC Token export HDC_TOKEN=$(aws secretsmanager get-secret-value --secret-id HDC_TOKEN | jq .SecretString | jq fromjson | jq -r .HDC_TOKEN) -# Alerting Email -export ALERTING_EMAIL_USER=$(aws secretsmanager get-secret-value --secret-id ALERTING_EMAIL | jq .SecretString | jq fromjson | jq -r .ALERTING_EMAIL_USER) -export ALERTING_EMAIL_PASSWORD=$(aws secretsmanager get-secret-value --secret-id ALERTING_EMAIL | jq .SecretString | jq fromjson | jq -r .ALERTING_EMAIL_PASSWORD) - # ACLED Credentials export ACLED_API_KEY=$(aws secretsmanager get-secret-value --secret-id ACLED_CREDENTIALS | jq .SecretString | jq fromjson | jq -r .ACLED_API_KEY) export ACLED_API_EMAIL=$(aws secretsmanager get-secret-value --secret-id ACLED_CREDENTIALS | jq .SecretString | jq fromjson | jq -r .ACLED_API_EMAIL) export HOSTNAME=prism-api.ovio.org +export INFO_EMAIL=info@ovio.org