chore: reverted old services to old ports

docker-compose.yml

@@ -60,7 +60,7 @@ services:
     depends_on:
       - hoppscotch-backend
     ports:
-      - "3180:80"
+      - "3280:80"
       - "3100:3100"
 
   # The service that spins up all 3 services at once in one container
@@ -139,8 +139,7 @@ services:
     depends_on:
       - hoppscotch-old-backend
     ports:
-      - "3080:80"
+      - "3000:8080"
-      - "3000:3000"
 
   hoppscotch-old-sh-admin:
     container_name: hoppscotch-old-sh-admin
@@ -152,5 +151,4 @@ services:
     depends_on:
       - hoppscotch-old-backend
     ports:
-      - "3180:80"
+      - "3100:8080"
-      - "3100:3100"

packages/hoppscotch-selfhost-web/Caddyfile

@@ -1,4 +1,4 @@
-:80 :3000 {
+:8080 {
   try_files {path} /
   root * /site
   file_server

packages/hoppscotch-selfhost-web/Dockerfile

@@ -18,5 +18,4 @@ WORKDIR /site
 COPY packages/hoppscotch-selfhost-web/Caddyfile /etc/caddy/Caddyfile
 COPY --from=builder /usr/src/app/packages/hoppscotch-selfhost-web/dist/ .
 
-EXPOSE 80
+EXPOSE 8080
-EXPOSE 3000

packages/hoppscotch-selfhost-web/aio.Caddyfile

@@ -0,0 +1,5 @@
+:80 :3000 {
+try_files {path} /
+root * /site
+file_server
+}

packages/hoppscotch-sh-admin/Caddyfile

@@ -0,0 +1,5 @@
+:8080 {
+  try_files {path} /
+  root * /site
+  file_server
+}

packages/hoppscotch-sh-admin/Dockerfile

@@ -18,5 +18,4 @@ WORKDIR /site
 COPY packages/hoppscotch-sh-admin/Caddyfile /etc/caddy/Caddyfile
 COPY --from=builder /usr/src/app/packages/hoppscotch-sh-admin/dist/ .
 
-EXPOSE 80
+EXPOSE 8080
-EXPOSE 3100

prod.Dockerfile

@@ -36,7 +36,7 @@ RUN pnpm run generate
 FROM caddy:2-alpine as app
 WORKDIR /site
 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/aio.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
@@ -61,7 +61,7 @@ RUN apk add nodejs npm
 RUN npm install -g @import-meta-env/cli
 EXPOSE 80
 EXPOSE 3100
-CMD ["/bin/sh", "-c", "node /usr/prod_run.mjs && caddy run --config /etc/caddy/Caddyfile --adapter caddyfile"]
+CMD ["node","/usr/prod_run.mjs"]
 
 FROM backend as aio
 RUN apk add caddy tini
@@ -80,3 +80,6 @@ EXPOSE 8080
 EXPOSE 3000
 EXPOSE 3100
 EXPOSE 80
+
+
+