Skip to content

Commit

Permalink
Revert "build: try using docker override file for host network mode"
Browse files Browse the repository at this point in the history
This reverts commit 95924a7.
  • Loading branch information
ozyx committed Oct 1, 2024
1 parent 95924a7 commit 23edd86
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/yamcs-quickstart-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF > 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
Expand Down
4 changes: 2 additions & 2 deletions .webpack/webpack.dev.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 23edd86

Please sign in to comment.