Streamlined dev vs prod config management

caddy/development/Caddyfile

@@ -0,0 +1,14 @@
+{
+	debug
+	auto_https off
+	local_certs
+}
+
+localhost {
+	reverse_proxy invenio-rdm:5000
+	encode gzip
+	log {
+		format console
+		level DEBUG
+	}
+}

caddy/production/Caddyfile

@@ -2,7 +2,7 @@
 	admin off
 }
 
-localhost {
+invenio.i-form.ie {
 	reverse_proxy invenio-rdm:5000
 	encode gzip
 }

docker-compose.yaml

@@ -11,7 +11,7 @@ services:
             - "8443:443"
         volumes:
             - caddy_data:/data
-            - ./caddy:/etc/caddy
+            - ./caddy/${INVENIO_ENV}:/etc/caddy
         restart: unless-stopped
         labels:
             - "io.containers.autoupdate=registry"

env.sh

@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
-
 if [[ "$*" == *--dev* ]]; then
+  echo "Configuring env in development mode"
   ENV_FILE="invenio_dev.env"
 else
-  ENV_FILE="invenio.env"
+  echo "Configuring env in production mode"
+  ENV_FILE="invenio_prod.env"
 fi
 
 aws secretsmanager get-secret-value --secret-id Invenio | \
   jq -r '.SecretString | fromjson | to_entries | .[] | .key + "=\"" + .value + "\""' > secrets.env
 
-cat "$ENV_FILE" secrets.env > .env
+cat ./env/invenio.env "./env/$ENV_FILE" secrets.env > .env
 
 echo "Environment set up using $ENV_FILE"

env/invenio.env

@@ -0,0 +1,7 @@
+INVENIO_S3_ENDPOINT_URL=https://s3.eu-west-1.amazonaws.com
+INVENIO_S3_REGION_NAME=eu-west-1
+INVENIO_S3_BUCKET_NAME=i-form-invenio
+INVENIO_THEME_LOGO=custom_assets/I-Form_logo.webp
+INVENIO_THEME_FRONTPAGE_TITLE="I-Form Invenio Data Repository"
+INVENIO_THEME_SITENAME="I-Form Repository"
+INVENIO_THEME_FRONTPAGE_SUBTITLE="An Invenio data repository for the I-Form research group."

env/invenio_dev.env

@@ -0,0 +1,5 @@
+INVENIO_APP_ALLOWED_HOSTS=["invenio.i-form.ie", "localhost", "localhost:5000", "127.0.0.1", "127.0.0.1:5000", "0.0.0.0", "0.0.0.0:5000"]
+INVENIO_SITE_UI_URL=https://localhost:5000
+INVENIO_SITE_API_URL=https://localhost:5000/api
+FLASK_ENV=development
+INVENIO_ENV=development

env/invenio_prod.env

@@ -0,0 +1,5 @@
+INVENIO_APP_ALLOWED_HOSTS=["invenio.i-form.ie"]
+INVENIO_SITE_UI_URL=https://invenio.i-form.ie
+INVENIO_SITE_API_URL=https://invenio.i-form.ie/api
+FLASK_ENV=production
+INVENIO_ENV=production

invenio.env

@@ -1,11 +0,0 @@
-INVENIO_APP_ALLOWED_HOSTS=["invenio.i-form.ie"]
-INVENIO_S3_ENDPOINT_URL="https://s3.eu-west-1.amazonaws.com"
-INVENIO_S3_REGION_NAME="eu-west-1"
-INVENIO_S3_BUCKET_NAME="i-form-invenio"
-INVENIO_THEME_LOGO="custom_assets/I-Form_logo.webp"
-INVENIO_THEME_FRONTPAGE_TITLE="I-Form Invenio Data Repository"
-INVENIO_THEME_SITENAME="I-Form Repository"
-INVENIO_THEME_FRONTPAGE_SUBTITLE="An Invenio data repository for the I-Form research group."
-INVENIO_SITE_UI_URL="https://invenio.i-form.ie"
-INVENIO_SITE_API_URL="https://invenio.i-form.ie/api"
-INVENIO_ENV="production"

invenio_dev.env

@@ -1,14 +0,0 @@
-INVENIO_APP_ALLOWED_HOSTS=["invenio.i-form.ie", "localhost", "localhost:5000", "127.0.0.1", "127.0.0.1:5000", "0.0.0.0", "0.0.0.0:5000"]
-INVENIO_S3_ENDPOINT_URL="https://s3.eu-west-1.amazonaws.com"
-INVENIO_S3_REGION_NAME="eu-west-1"
-INVENIO_S3_BUCKET_NAME="i-form-invenio"
-INVENIO_THEME_LOGO="custom_assets/I-Form_logo.webp"
-INVENIO_THEME_FRONTPAGE_TITLE="I-Form Invenio Data Repository"
-INVENIO_THEME_SITENAME="I-Form Repository"
-INVENIO_THEME_FRONTPAGE_SUBTITLE="An Invenio data repository for the I-Form research group."
-INVENIO_SITE_UI_URL="https://localhost:5000"
-INVENIO_SITE_API_URL="https://localhost:5000/api"
-INVENIO_FORCE_HTTPS=false
-INVENIO_APP_ENABLE_SECURE_HEADERS=False
-FLASK_ENV="development"
-INVENIO_ENV="development"

justfile

@@ -79,8 +79,8 @@ cleanup-versions:
         rm -f "versions/${tag#backup-}.txt"
     done
 
-deploy:
-    #!/usr/bin/env bash
+deploy *args:
+    ./env.sh {{args}}
     docker compose up -d --wait
     docker compose exec -it worker setup.sh