chore: misc. fixes related to containerization

arcanemachine · Oct 1, 2023 · ab0194c · ab0194c
1 parent 8fba064
commit ab0194c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/support/containers/compose.phoenix.yaml b/support/containers/compose.phoenix.yaml
@@ -9,13 +9,13 @@ services:
       PORT: "${PORT:?}"
       SECRET_KEY_BASE: "${SECRET_KEY_BASE:?}"
 
-      # db
+      # database
       DATABASE_URL: "${DATABASE_URL:?}"
 
       # email
       AWS_REGION: "${AWS_REGION:?}"
       AWS_ACCESS_KEY: "${AWS_ACCESS_KEY:?}"
-      AWS_SECRET: "${AWS_SECRET:?}"
+      AWS_SECRET: "${AWS_SECRET}"
 
       # sentry
-      SENTRY_DSN: "${SENTRY_DSN:?}"
+      SENTRY_DSN: "${SENTRY_DSN}"
diff --git a/support/containers/networks/compose.phoenix-traefik.yaml b/support/containers/networks/compose.phoenix-traefik.yaml
@@ -2,7 +2,7 @@
 services:
   phoenix:
     environment:
-      DATABASE_URL: "ecto://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST:-postgres}/${POSTGRES_DB}"
+      DATABASE_URL: "${DATABASE_URL:?}"
     networks:
       - "traefik-global-proxy"
       - "phoenix-todo-list"

diff --git a/support/containers/networks/compose.postgres-traefik.yaml b/support/containers/networks/compose.postgres-traefik.yaml
@@ -1,7 +1,6 @@
 ---
 services:
   postgres:
-    hostname: "postgres"
     networks:
       - "phoenix-todo-list"
     ports:

diff --git a/support/scripts/dotenv-generate--template b/support/scripts/dotenv-generate--template
@@ -38,12 +38,12 @@ PHX_HOST=\"${PHX_HOST:-$default_phx_host}\"
 PORT=\"${PORT:-4000}\"
 SECRET_KEY_BASE=\"${SECRET_KEY_BASE:-$(openssl rand -base64 48)}\"
 
-# db
+# database
 POSTGRES_DB=\"${POSTGRES_DB:-todo_list}\"
 POSTGRES_HOST=\"${POSTGRES_HOST:-postgres}\"
 POSTGRES_USER=\"${POSTGRES_USER:-postgres}\"
 POSTGRES_PASSWORD=\"${POSTGRES_PASSWORD:-postgres}\"
-DATABASE_URL=\"${DATABASE_URL:-ecto://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@${POSTGRES_HOST:-postgres}/${POSTGRES_DB:-todo_list}}\"
+DATABASE_URL=\"${DATABASE_URL:-ecto://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@${POSTGRES_HOST:-localhost}/${POSTGRES_DB:-todo_list}}\"
 
 # docker
 COMPOSE_PROJECT_NAME=\"${COMPOSE_PROJECT_NAME:-phoenix-todo-list}\"

diff --git a/support/scripts/systemd-container-service-file-generate b/support/scripts/systemd-container-service-file-generate
@@ -191,10 +191,10 @@ Environment=SECRET_KEY_BASE=\"$SECRET_KEY_BASE\"
 
 # db
 Environment=DATABASE_URL=\"$DATABASE_URL\"
-Environment=POSTGRES_DB=\"$POSTGRES_DB\"
-Environment=POSTGRES_HOST=\"$POSTGRES_HOST\"
 Environment=POSTGRES_USER=\"$POSTGRES_USER\"
 Environment=POSTGRES_PASSWORD=\"$POSTGRES_PASSWORD\"
+Environment=POSTGRES_HOST=\"$POSTGRES_HOST\"
+Environment=POSTGRES_DB=\"$POSTGRES_DB\"
 
 # docker
 # fix container timeout issues caused by slow CPU and/or RAM