Merge pull request #820 from omnivore-app/fix/content-fetch-docker-hub

fix/content fetch docker hub

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:
@@ -125,12 +125,13 @@ services:
   content-fetch:
     build:
       context: .
-      dockerfile: ./packages/puppeteer-parse/Dockerfile
+      dockerfile: ./packages/content-fetch/Dockerfile
     container_name: "omnivore-content-fetch"
     expose:
       - 9090
     environment:
       - JWT_SECRET=some_secret
+      - VERIFICATION_TOKEN=some_token
       - REST_BACKEND_ENDPOINT=http://api:8080/api
     depends_on:
       api:

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

packages/content-fetch/Dockerfile

@@ -1,3 +1,4 @@
+
 FROM node:14.18-alpine
 
 # Installs latest Chromium (92) package.
@@ -9,6 +10,10 @@ RUN apk add --no-cache \
       ca-certificates \
       ttf-freefont \
       nodejs \
+      gcc \
+      g++ \
+      python3 \
+      make \
       yarn
 
 # Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
@@ -31,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"]
+CMD ["yarn", "workspace", "@omnivore/content-fetch", "start"]

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')
   },