[PR #4843] [MERGED] feat(infra): make webapp server part of fe container #4960

New issue

Closed

opened 2026-03-17 02:27:02 +03:00 by kerem · 0 comments

kerem commented

2026-03-17 02:27:02 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hoppscotch/hoppscotch/pull/4843
Author: @CuriousCorrelation
Created: 3/6/2025
Status: ✅ Merged
Merged: 3/6/2025
Merged by: @jamesgeorge007

Base: patch ← Head: feat/webapp-server-part-of-fe-image

📝 Commits (1)

7641a96 feat: make webapp server part of fe container

📊 Changes

2 files changed (+11 additions, -30 deletions)

View changed files

📝 docker-compose.yml (+5 -18)
📝 prod.Dockerfile (+6 -12)

📄 Description

This PR makes webapp-server (the server that the Desktop App uses to gather Hoppscotch App contents) part of the frontend container. Both Caddy and webapp-server now uses the same /dist directory (previously copied over in webapp-server container).

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hoppscotch/hoppscotch/pull/4843 **Author:** [@CuriousCorrelation](https://github.com/CuriousCorrelation) **Created:** 3/6/2025 **Status:** ✅ Merged **Merged:** 3/6/2025 **Merged by:** [@jamesgeorge007](https://github.com/jamesgeorge007) **Base:** `patch` ← **Head:** `feat/webapp-server-part-of-fe-image` --- ### 📝 Commits (1) - [`7641a96`](https://github.com/hoppscotch/hoppscotch/commit/7641a961dbd12127518c4d4e1f52cddcbf76334b) feat: make webapp server part of fe container ### 📊 Changes **2 files changed** (+11 additions, -30 deletions) <details> <summary>View changed files</summary> 📝 `docker-compose.yml` (+5 -18) 📝 `prod.Dockerfile` (+6 -12) </details> ### 📄 Description This PR makes `webapp-server` (the server that the Desktop App uses to gather Hoppscotch App contents) part of the frontend container. Both `Caddy` and `webapp-server` now uses the same `/dist` directory (previously copied over in `webapp-server` container). --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>