From ca7b79d1badbae06ade77edb3516546dc6e6298b Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 11 Feb 2022 11:45:27 -0800
Subject: [PATCH] Simplify docker compose setup for new users

This takes out some environment variables that are not needed
for new users testing out locally.

We also adjusted the port usage so docker-compose will use the
same ports that local dev typically uses.
---
 docker-compose.yml       | 17 ++++++++++-------
 packages/api/src/util.ts |  2 ++
 packages/web/Dockerfile  |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5c1a05720..bf9f093f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,15 +51,13 @@ services:
       - PG_DB=omnivore
       - PG_PORT=5432
       - PG_POOL_MAX=20
-      - IMAGE_PROXY_URL=http://localhost:8080
+      - IMAGE_PROXY_URL=http://localhost:9999
       - IMAGE_PROXY_SECRET=some-secret
       - JWT_SECRET=some_secret
       - SSO_JWT_SECRET=some_sso_secret
       - CLIENT_URL=http://localhost:3000
-      - GATEWAY_URL=http://localhost:4000/api
+      - GATEWAY_URL=http://localhost:8080/api
       - PUPPETEER_TASK_HANDLER_URL=http://localhost:9090/
-      - PREVIEW_IMAGE_WRAPPER_ID='selected_highlight_wrapper'
-      - PREVIEW_GENERATION_SERVICE_URL=http://localhost:8080/preview
       - REMINDER_TASK_HANDLER_URL=/svc/reminders/trigger
     depends_on:
       migrate:
@@ -71,12 +69,17 @@ services:
       dockerfile: ./packages/web/Dockerfile
       args:
         - APP_ENV=prod
-        - BASE_URL=http://localhost:8080
+        - BASE_URL=http://localhost:3000
         - SERVER_BASE_URL=http://localhost:4000
-        - HIGHLIGHTS_BASE_URL=http://localhost:8080
+        - HIGHLIGHTS_BASE_URL=http://localhost:3000
     container_name: "omnivore-web"
     ports:
-      - "8080:8080"
+      - "3000:8080"
+    environment:
+      - NEXT_PUBLIC_APP_ENV=prod
+      - NEXT_PUBLIC_BASE_URL=http://localhost:3000
+      - NEXT_PUBLIC_SERVER_BASE_URL=http://localhost:4000
+      - NEXT_PUBLIC_HIGHLIGHTS_BASE_URL=http://localhost:3000
     depends_on:
       api:
         condition: service_healthy
diff --git a/packages/api/src/util.ts b/packages/api/src/util.ts
index 8dafd2026..7b4e2565e 100755
--- a/packages/api/src/util.ts
+++ b/packages/api/src/util.ts
@@ -95,6 +95,8 @@ const nullableEnvVars = [
   'PUPPETEER_QUEUE_LOCATION',
   'PUPPETEER_QUEUE_NAME',
   'PUPPETEER_TASK_HANDLER_URL',
+  'PREVIEW_IMAGE_WRAPPER_ID',
+  'PREVIEW_GENERATION_SERVICE_URL',
   'GCS_UPLOAD_SA_KEY_FILE_PATH',
   'GAUTH_IOS_CLIENT_ID',
   'GAUTH_CLIENT_ID',
diff --git a/packages/web/Dockerfile b/packages/web/Dockerfile
index 1f20f2a3f..9e3cebd28 100644
--- a/packages/web/Dockerfile
+++ b/packages/web/Dockerfile
@@ -9,7 +9,7 @@ ARG SERVER_BASE_URL
 ARG HIGHLIGHTS_BASE_URL
 ENV NEXT_PUBLIC_APP_ENV=$APP_ENV
 ENV NEXT_PUBLIC_BASE_URL=$BASE_URL
-ENV NEXT_PUBLIC_SERVER_BASE_URL=$BASE_URL
+ENV NEXT_PUBLIC_SERVER_BASE_URL=$SERVER_BASE_URL
 ENV NEXT_PUBLIC_HIGHLIGHTS_BASE_URL=$HIGHLIGHTS_BASE_URL
 
 WORKDIR /app