diff --git a/.github/workflows/yamcs-quickstart-e2e.yml b/.github/workflows/yamcs-quickstart-e2e.yml index 5efa438b..f225d747 100644 --- a/.github/workflows/yamcs-quickstart-e2e.yml +++ b/.github/workflows/yamcs-quickstart-e2e.yml @@ -40,6 +40,19 @@ 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 edfec52c..a71e289e 100644 --- a/.webpack/webpack.dev.mjs +++ b/.webpack/webpack.dev.mjs @@ -51,14 +51,14 @@ const devConfig = { proxy: [ { context: ["/yamcs-proxy/"], - target: "http://0.0.0.0:8090/", + target: "http://localhost:8090/", secure: false, changeOrigin: true, pathRewrite: { "^/yamcs-proxy/": "" }, }, { context: ["/yamcs-proxy-ws/"], - target: "ws://0.0.0.0:8090/api/websocket", + target: "ws://localhost:8090/api/websocket", secure: false, changeOrigin: true, ws: true,