Sync with upstream

.env.docker

@@ -34,7 +34,7 @@ SENTRY_DSN=
 DEFAULT_SUBSCRIPTION=SELF_HOSTED
 
 ## FRONTEND URL ##
-CLIENT_URL=https://webwhiz.ai
+CLIENT_URL=https://app.webwhiz.ai
 
 ## EMAIL RELATED ##
 EMAIL_SENDER_EMAIL=hi@webwhiz.ai

.env.sample

@@ -26,7 +26,7 @@ SENDGRID_API_KEY=dummy
 SENTRY_DSN=
 
 ## FRONTEND URL ##
-CLIENT_URL=https://webwhiz.ai
+CLIENT_URL=https://app.webwhiz.ai
 
 ## EMAIL RELATED ##
 EMAIL_SENDER_EMAIL=hi@webwhiz.ai

.tool-versions

@@ -1 +1 @@
-nodejs 18.20.8
+nodejs 20.19.5

Dockerfile

@@ -2,7 +2,7 @@
 # BUILD FOR PRODUCTION
 ###################
 
-FROM node:18-alpine As build
+FROM node:20-alpine As build
 
 WORKDIR /usr/src/app
 
@@ -27,12 +27,12 @@ USER node
 # PRODUCTION
 ###################
 
-FROM node:18-alpine As production
+FROM node:20-alpine As production
 
 # Copy the bundled code from the build stage to the production image
 COPY --chown=node:node --from=build /usr/src/app/node_modules ./node_modules
 COPY --chown=node:node --from=build /usr/src/app/dist ./dist
 COPY --chown=node:node .env.docker .env
 
 # Start the server using the production build
-CMD [ "node", "dist/main.js" ]
+CMD [ "node", "dist/main.js" ]

Dockerfile.dev

@@ -2,7 +2,7 @@
 # DEVELOPMENT
 ###################
 
-FROM node:18-alpine As development
+FROM node:20-alpine As development
 
 WORKDIR /usr/src/app
 
@@ -16,4 +16,4 @@ ENV NODE_ENV development
 
 EXPOSE 3000
 
-CMD ["yarn", "run", "start:dev"]
+CMD ["yarn", "run", "start:dev"]

docker-compose.yml

@@ -19,12 +19,12 @@ services:
       - .:/usr/src/app
       - /usr/src/app/node_modules # Prevent overwriting of `node_modules`
     ports:
-      - "3000:3000"
+      - "127.0.0.1:3000:3000"
     environment:
       NODE_ENV: development
-    env_file: 
+    env_file:
       - .env.docker
-      - .env.docker.local      
+      - .env.docker.local
     command: yarn run start:dev
     depends_on:
       - redis
@@ -33,12 +33,23 @@ services:
   nodejs_worker:
     build: .
     command: node dist/crawler.main.js
+    volumes:
+      - .:/usr/src/app
+      - /usr/src/app/node_modules # Prevent overwriting of `node_modules`
+    env_file:
+      - .env.docker
+      - .env.docker.local
     depends_on:
       - redis
       - mongodb
 
   python_worker:
     build: ./workers
+    volumes:
+      - ./workers:/app
+    env_file:
+      - .env.docker
+      - .env.docker.local
     depends_on:
       - redis
       - mongodb
@@ -47,8 +58,11 @@ services:
     build:
       context: ./frontend
       dockerfile: Dockerfile.dev
+    volumes:
+      - ./frontend:/app
+      - /app/node_modules
     ports:
-      - "3030:3001"
+      - "127.0.0.1:3030:3030"
     depends_on:
       - web
 
@@ -59,7 +73,7 @@ services:
       args:
          - PIRSCH_KEY
     ports:
-      - "3031:1234"
+      - "127.0.0.1:3031:1234"
     depends_on:
       - web
 

frontend/.env.development

@@ -1,4 +1,6 @@
 SKIP_PREFLIGHT_CHECK=true
-REACT_APP_BASE_URL='https://api.webwhiz.ai'
-REACT_APP_GOOGLE_AUTH_ID='158883259855-qn8g2bi77kqo0igt20pi6jb58797upm5.apps.googleusercontent.com'
-PORT=3001
+REACT_APP_BASE_URL='http://localhost:3000'
+REACT_APP_GOOGLE_AUTH_ID=dummy
+PORT=3030
+
+REACT_APP_WEBWHIZ_WIDGET_URL="https://widget.webwhiz.ai"

frontend/.env.docker

@@ -1,3 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true
 REACT_APP_BASE_URL='/api'
 REACT_APP_GOOGLE_AUTH_ID='dummy'
+
+REACT_APP_WEBWHIZ_WIDGET_URL="https://widget.webwhiz.ai"

frontend/.env.sample

@@ -0,0 +1,5 @@
+SKIP_PREFLIGHT_CHECK=true
+REACT_APP_BASE_URL='http://api.webwhiz.ai'
+REACT_APP_GOOGLE_AUTH_ID=dummy
+
+REACT_APP_WEBWHIZ_WIDGET_URL="https://widget.webwhiz.ai"

frontend/.tool-versions

@@ -1 +1 @@
-nodejs 14.21.3
+nodejs 18.20.8

frontend/Dockerfile.dev

@@ -1,6 +1,5 @@
 # Fetching the latest node image on apline linux
-FROM node:14-alpine
-
+FROM node:16-alpine
 # Setting up the work directory
 WORKDIR /app
 
@@ -14,4 +13,4 @@ COPY . .
 COPY .env.docker .env
 
 # Building our application
-CMD ["npm", "run", "start"]
+CMD ["npm", "run", "start"]