From ddaac82653a98f510cb2c8cd658101a1d9edb150 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 17 Jun 2022 14:59:42 -0700
Subject: [PATCH] Fix content-fetch on docker compose

---
 docker-compose.yml                       |  7 ++++---
 packages/api/.env.example                |  2 +-
 packages/content-fetch/Dockerfile        | 11 ++++++++---
 packages/content-fetch/medium-handler.js |  1 +
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b089f2d52..d49a69d9b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -93,7 +93,7 @@ services:
       - SSO_JWT_SECRET=some_sso_secret
       - CLIENT_URL=http://localhost:3000
       - GATEWAY_URL=http://localhost:8080/api
-      - PUPPETEER_TASK_HANDLER_URL=http://content-fetch:9090/
+      - PUPPETEER_TASK_HANDLER_URL=http://content-fetch:8080/?token=some_token
       - REMINDER_TASK_HANDLER_URL=/svc/reminders/trigger
     depends_on:
       migrate:
@@ -127,10 +127,11 @@ services:
       context: .
       dockerfile: ./packages/content-fetch/Dockerfile
     container_name: "omnivore-content-fetch"
-    ports:
-      - "9090:9090"
+    expose:
+      - 9090
     environment:
       - JWT_SECRET=some_secret
+      - VERIFICATION_TOKEN=some_token
       - REST_BACKEND_ENDPOINT=http://api:8080/api
     depends_on:
       api:
diff --git a/packages/api/.env.example b/packages/api/.env.example
index 7c3204150..6a9950594 100644
--- a/packages/api/.env.example
+++ b/packages/api/.env.example
@@ -24,4 +24,4 @@ GCS_UPLOAD_SA_KEY_FILE_PATH=
 TWITTER_BEARER_TOKEN=
 PREVIEW_IMAGE_WRAPPER_ID='selected_highlight_wrapper'
 REMINDER_TASK_HANDLER_URL=
-ELASTIC_URL=http://localhost:9200
+ELASTIC_URL=http://localhost:9200
\ No newline at end of file
diff --git a/packages/content-fetch/Dockerfile b/packages/content-fetch/Dockerfile
index 025258ef0..4400363f3 100644
--- a/packages/content-fetch/Dockerfile
+++ b/packages/content-fetch/Dockerfile
@@ -36,11 +36,16 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
 ENV CHROMIUM_PATH /usr/bin/chromium-browser
 ENV LAUNCH_HEADLESS=true
 
-COPY . /app/
-WORKDIR app
+COPY package.json .
+COPY yarn.lock .
+COPY tsconfig.json .
+COPY .prettierrc .
+COPY .eslintrc .
+
+COPY /packages/content-fetch ./packages/content-fetch
 
 RUN yarn install --pure-lockfile
 
 EXPOSE 8080
 
-ENTRYPOINT ["yarn", "start"]
\ No newline at end of file
+CMD ["yarn", "workspace", "@omnivore/content-fetch", "start"]
\ No newline at end of file
diff --git a/packages/content-fetch/medium-handler.js b/packages/content-fetch/medium-handler.js
index c1c98d259..e6a605a0e 100644
--- a/packages/content-fetch/medium-handler.js
+++ b/packages/content-fetch/medium-handler.js
@@ -10,6 +10,7 @@ const os = require('os');
 exports.mediumHandler = {
 
   shouldPrehandle: (url, env) => {
+    const u = new URL(url);
     return u.hostname.endsWith('medium.com')
   },