From 28059ddc60f1ad57147cd5b43170d13962c950c2 Mon Sep 17 00:00:00 2001
From: Balu Babu <balub997@gmail.com>
Date: Mon, 13 Nov 2023 01:42:23 +0530
Subject: [PATCH] chore: hoppscotch-app supports std http ports

---
 docker-compose.yml                          | 6 ++++--
 packages/hoppscotch-selfhost-web/Caddyfile  | 2 +-
 packages/hoppscotch-selfhost-web/Dockerfile | 3 ++-
 prod.Dockerfile                             | 5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 423a8cce0..464f32d4c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,7 +42,8 @@ services:
     depends_on:
       - hoppscotch-backend
     ports:
-      - "3000:8080"
+      - "3080:80"
+      - "3000:3000"
 
   # The Self Host dashboard for managing the app. This will be hosted at port 3100
   # NOTE: To do TLS or play around with how the app is hosted, you can look into the Caddyfile for
@@ -136,7 +137,8 @@ services:
     depends_on:
       - hoppscotch-old-backend
     ports:
-      - "3000:8080"
+      - "3080:80"
+      - "3000:3000"
 
   hoppscotch-old-sh-admin:
     container_name: hoppscotch-old-sh-admin
diff --git a/packages/hoppscotch-selfhost-web/Caddyfile b/packages/hoppscotch-selfhost-web/Caddyfile
index 4d9382b53..fe55cbe4a 100644
--- a/packages/hoppscotch-selfhost-web/Caddyfile
+++ b/packages/hoppscotch-selfhost-web/Caddyfile
@@ -1,4 +1,4 @@
-:8080 {
+:80 :3000 {
   try_files {path} /
   root * /site
   file_server
diff --git a/packages/hoppscotch-selfhost-web/Dockerfile b/packages/hoppscotch-selfhost-web/Dockerfile
index b43ae334d..beceb5685 100644
--- a/packages/hoppscotch-selfhost-web/Dockerfile
+++ b/packages/hoppscotch-selfhost-web/Dockerfile
@@ -18,4 +18,5 @@ WORKDIR /site
 COPY packages/hoppscotch-selfhost-web/Caddyfile /etc/caddy/Caddyfile
 COPY --from=builder /usr/src/app/packages/hoppscotch-selfhost-web/dist/ .
 
-EXPOSE 8080
+EXPOSE 80
+EXPOSE 3000
diff --git a/prod.Dockerfile b/prod.Dockerfile
index f456c3d48..ed5491959 100644
--- a/prod.Dockerfile
+++ b/prod.Dockerfile
@@ -31,12 +31,13 @@ RUN pnpm run generate
 
 FROM caddy:2-alpine as app
 WORKDIR /site
-COPY --from=fe_builder /usr/src/app/packages/hoppscotch-sh-admin/prod_run.mjs /usr
+COPY --from=fe_builder /usr/src/app/packages/hoppscotch-selfhost-web/prod_run.mjs /usr
 COPY --from=fe_builder /usr/src/app/packages/hoppscotch-selfhost-web/Caddyfile /etc/caddy/Caddyfile
 COPY --from=fe_builder /usr/src/app/packages/hoppscotch-selfhost-web/dist/ .
 RUN apk add nodejs npm
 RUN npm install -g @import-meta-env/cli
-EXPOSE 8080
+EXPOSE 80
+EXPOSE 3000
 CMD ["/bin/sh", "-c", "node /usr/prod_run.mjs && caddy run --config /etc/caddy/Caddyfile --adapter caddyfile"]
 
 FROM base_builder as sh_admin_builder