chore: hoppscotch-sh-admin supports std http ports

This commit is contained in:
Balu Babu
2023-11-13 02:14:43 +05:30
parent 28059ddc60
commit f1e4ac7fc4
5 changed files with 11 additions and 7 deletions

View File

@@ -59,7 +59,8 @@ services:
depends_on: depends_on:
- hoppscotch-backend - hoppscotch-backend
ports: ports:
- "3100:8080" - "3180:80"
- "3100:3100"
# The service that spins up all 3 services at once in one container # The service that spins up all 3 services at once in one container
hoppscotch-aio: hoppscotch-aio:
@@ -150,4 +151,5 @@ services:
depends_on: depends_on:
- hoppscotch-old-backend - hoppscotch-old-backend
ports: ports:
- "3100:8080" - "3180:80"
- "3100:3100"

View File

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

View File

@@ -1,4 +1,4 @@
:8080 { :80 :3100 {
try_files {path} / try_files {path} /
root * /site/sh-admin-multiport-setup root * /site/sh-admin-multiport-setup
file_server file_server

View File

@@ -1,5 +1,5 @@
:8080 { :80 :3100 {
try_files {path} / try_files {path} /admin*
root * /site/sh-admin-subpath-access root * /site/sh-admin-subpath-access
file_server file_server
} }

View File

@@ -55,7 +55,8 @@ COPY --from=sh_admin_builder /usr/src/app/packages/hoppscotch-sh-admin/dist /sit
COPY --from=sh_admin_builder /usr/src/app/packages/hoppscotch-sh-admin/dist-subpath-access /site/sh-admin-subpath-access COPY --from=sh_admin_builder /usr/src/app/packages/hoppscotch-sh-admin/dist-subpath-access /site/sh-admin-subpath-access
RUN apk add nodejs npm RUN apk add nodejs npm
RUN npm install -g @import-meta-env/cli RUN npm install -g @import-meta-env/cli
EXPOSE 8080 EXPOSE 80
EXPOSE 3100
CMD ["/bin/sh", "-c", "node /usr/prod_run.mjs && caddy run --config /etc/caddy/Caddyfile --adapter caddyfile"] CMD ["/bin/sh", "-c", "node /usr/prod_run.mjs && caddy run --config /etc/caddy/Caddyfile --adapter caddyfile"]
FROM backend as aio FROM backend as aio