diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index 303beef..deb050a 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -32,7 +32,10 @@ jobs: - name: Build and push backend image run: | cd client - docker build -t alexmickelson/elixir-demo-frontend:$GITHUB_RUN_NUMBER . + docker build \ + --build-arg VITE_WS_SERVER=wss://elixir-demo.alexmickelson.guru/socket \ + -t alexmickelson/elixir-demo-frontend:$GITHUB_RUN_NUMBER \ + . docker push -q alexmickelson/elixir-demo-frontend:$GITHUB_RUN_NUMBER cd ../backend docker build -t alexmickelson/elixir-demo-backend:$GITHUB_RUN_NUMBER . diff --git a/client/Dockerfile b/client/Dockerfile index 1c74f25..59152d6 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -9,6 +9,9 @@ RUN npm install -g pnpm && pnpm install --frozen-lockfile COPY . . +ARG VITE_WS_SERVER=ws://localhost:4000/socket +ENV VITE_WS_SERVER=$VITE_WS_SERVER + RUN pnpm build FROM nginx:alpine diff --git a/client/src/main.tsx b/client/src/main.tsx index 64be8f7..6ee03cf 100644 --- a/client/src/main.tsx +++ b/client/src/main.tsx @@ -6,7 +6,7 @@ import { WebSocketProvider } from "./contexts/WebSocketContext.tsx"; import { GameChannelProvider } from "./contexts/GameChannelContext.tsx"; import { NameInput } from "./game/NameInput.tsx"; -const WS_SERVER = "ws://localhost:4000/socket"; +const WS_SERVER = import.meta.env.VITE_WS_SERVER ?? "ws://localhost:4000/socket"; const getPlayerNameFromUrl = () => { const params = new URLSearchParams(window.location.search);