From 23edd86423b2fb00dea5358b65e6adfefc4f63a1 Mon Sep 17 00:00:00 2001 From: "Mazzella, Jesse D. (ARC-TI)[KBR Wyle Services, LLC]" Date: Tue, 1 Oct 2024 16:46:53 -0700 Subject: [PATCH] Revert "build: try using docker override file for host network mode" This reverts commit 95924a7e1137842d09187a0ac6ca873b82db40e2. --- .github/workflows/yamcs-quickstart-e2e.yml | 13 ------------- .webpack/webpack.dev.mjs | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/yamcs-quickstart-e2e.yml b/.github/workflows/yamcs-quickstart-e2e.yml index f225d747..5efa438b 100644 --- a/.github/workflows/yamcs-quickstart-e2e.yml +++ b/.github/workflows/yamcs-quickstart-e2e.yml @@ -40,19 +40,6 @@ jobs: run: | mvn -B versions:set-property -Dproperty=yamcsVersion -DnewVersion=${{ matrix.yamcs-version }} working-directory: quickstart - - name: create docker-compose.override.yml - run: | - # Create a docker-compose.override.yml file to override the default settings - # This override file will configure the Yamcs service to use host networking, - # and clear any port and network configurations. - cat < docker-compose.override.yml - services: - yamcs: - network_mode: "host" # Use host networking - ports: [] # Clear ports - networks: [] # Clear networks - EOF - working-directory: quickstart/docker - name: trigger make all from docker dir. Orphan and redirect output to docker/makeout.txt run: | touch makeout.txt diff --git a/.webpack/webpack.dev.mjs b/.webpack/webpack.dev.mjs index a71e289e..edfec52c 100644 --- a/.webpack/webpack.dev.mjs +++ b/.webpack/webpack.dev.mjs @@ -51,14 +51,14 @@ const devConfig = { proxy: [ { context: ["/yamcs-proxy/"], - target: "http://localhost:8090/", + target: "http://0.0.0.0:8090/", secure: false, changeOrigin: true, pathRewrite: { "^/yamcs-proxy/": "" }, }, { context: ["/yamcs-proxy-ws/"], - target: "ws://localhost:8090/api/websocket", + target: "ws://0.0.0.0:8090/api/websocket", secure: false, changeOrigin: true, ws: true,