heroku docker changes

Author: PrasanKumar93

Diff for: Dockerfile.hub

@@ -13,8 +13,8 @@ COPY ./frontend ./frontend
 # Build the code
 RUN cd ./frontend && npm run build 
 
-# Replace the PORT env variable in the frontend server.js file generated by standalone build
-RUN sed -i 's/process\.env\.PORT/process.env.PORT_FRONTEND/g' /app/frontend/.next/standalone/server.js
+# Replace `process.env.PORT` with `process.env.PORT || process.env.PORT_FRONTEND` in the frontend server.js file generated by standalone build
+RUN sed -i 's/process\.env\.PORT/process.env.PORT || process.env.PORT_FRONTEND/g' /app/frontend/.next/standalone/server.js
 
 #-------------------builderImportTool-------------------------
 FROM node:18-alpine AS builderImportTool

Diff for: docker-compose.heroku.yml

@@ -0,0 +1,28 @@
+services:
+  import-tool-service:
+    container_name: import-tool-service
+    build:
+      context: ./backend/import-tool
+      dockerfile: Dockerfile
+    image: redis-utilities-import-tool-amd64:latest # built image name
+    platform: linux/amd64
+    ports:
+      - "${PORT_BACKEND}:${PORT_BACKEND}"
+    env_file:
+      - ./.env
+
+  frontend:
+    container_name: frontend
+    build:
+      context: ./frontend/
+      dockerfile: Dockerfile
+    image: redis-utilities-frontend-amd64:latest # built image name
+    platform: linux/amd64
+    ports:
+      - "${PORT_FRONTEND}:${PORT_FRONTEND}"
+    env_file:
+      - ./.env
+    stdin_open: true # -i input flag
+    tty: true # -t terminal flag
+    depends_on:
+      - import-tool-service

Diff for: frontend/Dockerfile

@@ -13,8 +13,9 @@ COPY . ./frontend
 # Build the code
 RUN cd ./frontend && npm run build 
 
-# Replace the PORT env variable in the frontend server.js file generated by standalone build
-RUN sed -i 's/process\.env\.PORT/process.env.PORT_FRONTEND/g' /app/frontend/.next/standalone/server.js
+# Replace `process.env.PORT` with `process.env.PORT || process.env.PORT_FRONTEND` in the frontend server.js file generated by standalone build
+RUN sed -i 's/process\.env\.PORT/process.env.PORT || process.env.PORT_FRONTEND/g' /app/frontend/.next/standalone/server.js
+
 
 #-------------------Final stage-------------------------
 FROM node:18-alpine

Diff for: frontend/src/app/import/page.tsx

@@ -145,6 +145,7 @@ const Page = () => {
             });
             if (result?.data) {
                 setRedisConUrl(testRedisUrl);
+                setTestRedisUrl(testRedisUrl.split('@')[1]); // prevent showing password part in UI
 
                 addToSet(setBodyClasses, IMPORT_ANIMATE_CSS.CHOOSE_UPLOAD_PATH);
 

Diff for: readme.hub.md

@@ -35,25 +35,37 @@ docker push prasanrajpurohit/redis-utilities:0.2.0
 # first time setup
 brew tap heroku/brew && brew install heroku  # For macOS
 
-heroku login # web login
-heroku create redis-utilities # or create a new app `redis-utilities` by dashboard
+heroku login # triggers web login
+
+# or create a new app by dashboard
+heroku create redis-utilities-import-tool
+heroku create redis-utilities-frontend
 
 # informing Heroku that your app should be run using the container stack
-heroku stack:set container -a redis-utilities
+heroku stack:set container -a redis-utilities-import-tool
+heroku stack:set container -a redis-utilities-frontend
 ```
 
 ```sh
 heroku container:login
 
+# Build platform specific image
+docker-compose -f docker-compose.heroku.yml build
+
 # Tag & Push the image to Heroku (appName/web):
-docker tag redis-utilities-amd64:latest registry.heroku.com/redis-utilities/web
-docker push registry.heroku.com/redis-utilities/web
+docker tag redis-utilities-import-tool-amd64:latest registry.heroku.com/redis-utilities-import-tool/web
+docker tag redis-utilities-frontend-amd64:latest registry.heroku.com/redis-utilities-frontend/web
+
+docker push registry.heroku.com/redis-utilities-import-tool/web
+docker push registry.heroku.com/redis-utilities-frontend/web
 
 # Release the image
-heroku container:release web -a redis-utilities
+heroku container:release web -a redis-utilities-import-tool
+# Add frontend env variables in heroku dashboard like IMPORT_TOOL_END_POINT="https://redis-utilities-import-tool-a67413fa5a22.herokuapp.com"
+heroku container:release web -a redis-utilities-frontend
 
 # Just restart the app
-heroku restart -a redis-utilities
-heroku ps -a redis-utilities
+heroku restart -a redis-utilities-frontend
+heroku ps -a redis-utilities-frontend
 
 ```