dev-deploy: restore GeoIP bind-mount, drop image bake
With the runner in host-mode, compose bind-mount paths resolve to real host paths the Docker daemon can see, so the GeoIP file no longer needs to be baked into the backend image to survive CI. Bring back the bind-mount of `pkg/geoip/test-data/.../mmdb`, matching how local-dev sources it. Image now only carries the backend binary, symmetric with the production `backend/Dockerfile`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -125,11 +125,7 @@ services:
|
|||||||
target: ${GALAXY_DEV_GAME_STATE_DIR}
|
target: ${GALAXY_DEV_GAME_STATE_DIR}
|
||||||
bind:
|
bind:
|
||||||
create_host_path: true
|
create_host_path: true
|
||||||
# The GeoIP database is baked into the backend image (see
|
- ../../pkg/geoip/test-data/test-data/GeoIP2-Country-Test.mmdb:/var/lib/galaxy/geoip.mmdb:ro
|
||||||
# tools/local-dev/backend.Dockerfile); a bind-mount is not used
|
|
||||||
# here because the source path resolves inside the runner
|
|
||||||
# workspace volume and the host Docker daemon cannot see it,
|
|
||||||
# which produced an "is a directory" error in CI.
|
|
||||||
networks:
|
networks:
|
||||||
- galaxy-internal
|
- galaxy-internal
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
|||||||
@@ -24,16 +24,6 @@ COPY pkg/transcoder/ ./pkg/transcoder/
|
|||||||
COPY pkg/util/ ./pkg/util/
|
COPY pkg/util/ ./pkg/util/
|
||||||
COPY backend/ ./backend/
|
COPY backend/ ./backend/
|
||||||
|
|
||||||
# Bake the GeoIP test database into the build context so downstream
|
|
||||||
# stages can copy it into the runtime image. The path is the
|
|
||||||
# `MaxMind-DB` git submodule under `pkg/geoip/test-data/`; the file is
|
|
||||||
# the smallest country DB MaxMind publishes and is what every other
|
|
||||||
# dev-stack uses. Baking it lets dev-deploy skip the bind-mount that
|
|
||||||
# fails on runner-workspace volumes the host Docker daemon cannot see.
|
|
||||||
RUN mkdir -p /out/var/lib/galaxy
|
|
||||||
COPY pkg/geoip/test-data/test-data/GeoIP2-Country-Test.mmdb \
|
|
||||||
/out/var/lib/galaxy/geoip.mmdb
|
|
||||||
|
|
||||||
RUN <<'EOF' cat > go.work
|
RUN <<'EOF' cat > go.work
|
||||||
go 1.26.2
|
go 1.26.2
|
||||||
|
|
||||||
@@ -77,6 +67,5 @@ EXPOSE 8080
|
|||||||
EXPOSE 8081
|
EXPOSE 8081
|
||||||
|
|
||||||
COPY --from=builder /out/backend /usr/local/bin/backend
|
COPY --from=builder /out/backend /usr/local/bin/backend
|
||||||
COPY --from=builder /out/var/lib/galaxy/geoip.mmdb /var/lib/galaxy/geoip.mmdb
|
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/backend"]
|
ENTRYPOINT ["/usr/local/bin/backend"]
|
||||||
|
|||||||
Reference in New Issue
Block a user