diff --git a/backend/Dockerfile b/backend/Dockerfile index 8583dad..2a5ff90 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -30,8 +30,9 @@ COPY go.work go.work.sum ./ COPY pkg ./pkg COPY backend ./backend -# Reduce the workspace to what the backend needs: backend + pkg. -RUN go work edit -dropuse=./gateway -dropuse=./platform/telegram +# Reduce the workspace to what the backend needs: backend + pkg. loadtest and the +# gateway replace it requires are not in this context, so drop both. +RUN go work edit -dropuse=./gateway -dropuse=./platform/telegram -dropuse=./loadtest -dropreplace=scrabble/gateway@v0.0.0 RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o /out/backend ./backend/cmd/backend # --- runtime ----------------------------------------------------------------- diff --git a/gateway/Dockerfile b/gateway/Dockerfile index c65dcf4..8a45a94 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -50,8 +50,9 @@ COPY gateway ./gateway RUN rm -rf gateway/internal/webui/dist COPY --from=ui /ui/dist gateway/internal/webui/dist -# Reduce the workspace to what the gateway needs: gateway + pkg. -RUN go work edit -dropuse=./backend -dropuse=./platform/telegram +# Reduce the workspace to what the gateway needs: gateway + pkg (loadtest is not in +# this context; its scrabble/gateway replace targets ./gateway, which is present here). +RUN go work edit -dropuse=./backend -dropuse=./platform/telegram -dropuse=./loadtest RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o /out/gateway ./gateway/cmd/gateway # --- runtime ----------------------------------------------------------------- diff --git a/platform/telegram/Dockerfile b/platform/telegram/Dockerfile index 16ebd9d..c64c6a5 100644 --- a/platform/telegram/Dockerfile +++ b/platform/telegram/Dockerfile @@ -1,8 +1,9 @@ # Telegram connector image. # # The connector imports only the shared scrabble/pkg module, so the build drops the -# other workspace modules (backend, gateway) and the scrabble-solver replace from a -# copy of go.work: it needs neither their sources nor the solver sibling checkout. +# other workspace modules (backend, gateway, loadtest), the loadtest-only +# scrabble/gateway replace and the scrabble-solver replace from a copy of go.work: it +# needs neither their sources nor the solver sibling checkout. # Build from the repository ROOT so go.work, pkg/ and platform/telegram/ are all in # the context (see deploy/docker-compose.yml, which sets context: ../../..). FROM golang:1.26.3-alpine AS build @@ -13,7 +14,7 @@ COPY pkg ./pkg COPY platform/telegram ./platform/telegram # Reduce the workspace to what the connector needs: only pkg + platform/telegram. -RUN go work edit -dropuse=./backend -dropuse=./gateway -dropreplace=scrabble-solver +RUN go work edit -dropuse=./backend -dropuse=./gateway -dropuse=./loadtest -dropreplace=scrabble/gateway@v0.0.0 -dropreplace=scrabble-solver RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -o /out/telegram ./platform/telegram/cmd/telegram