Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions preview-service/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
# was Factorio 2.1.14 against a pin that meant 2.1.12, and only the assertion
# below stood between it and production.
#
# With the tag present, Renovate tracks `2.1.23` and can only ever re-pin THAT
# With the tag present, Renovate tracks `2.1.24` and can only ever re-pin THAT
# tag's digest, so a silent version jump is impossible by construction rather
# than merely detectable. Moving to a new Factorio is then a deliberate edit of
# the tag, the digest and the assertion together - which
# test/dockerfile.test.mjs checks stay in agreement.
#
# Refresh the digest for a tag with:
# docker pull --platform linux/amd64 factoriotools/factorio:2.1.23
# docker inspect --format='{{index .RepoDigests 0}}' factoriotools/factorio:2.1.23
FROM factoriotools/factorio:2.1.23@sha256:1e1773337f5be1d93f61d1d64757f18c19c8eb345c96acc57e0d3567a4fd4c3f
# docker pull --platform linux/amd64 factoriotools/factorio:2.1.24
# docker inspect --format='{{index .RepoDigests 0}}' factoriotools/factorio:2.1.24
FROM factoriotools/factorio:2.1.24@sha256:a0c019b7608975a58f1694de54a2326e13a5aa2d123c18f48e5396181e366e28

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes the tag to 2.1.24, but the other places that name the version still say 2.1.23:

  • preview-service/container/Dockerfile:27 still has RUN ... factorio --version | grep -q "Version: 2.1.23". The image build would fail at that step against a 2.1.24 base.
  • FACTORIO_VERSION in preview-service/worker/wrangler.jsonc:23 is still "2.1.23". That value is part of the render cache key.
  • The refresh-command comments on lines 16-17 still name 2.1.23.

dockerfile.test.mjs asserts that the FROM tag, the --version assertion and FACTORIO_VERSION agree, so preview:test and the required verify check should fail on this commit. The PR body lists the same steps (update the assertion and FACTORIO_VERSION, run pnpm run types:sync) as required before merging a tag change; see CLAUDE.md, "Preview service".

Please update all three in this PR, run pnpm run types:sync, and run pnpm --filter @fmw/preview-container run test:integration to build the image.


# Node for the HTTP wrapper (base image is Debian-based).
USER root
RUN apt-get update && apt-get install -y --no-install-recommends nodejs && rm -rf /var/lib/apt/lists/*

# Fail fast if the pinned Factorio is not 2.1.23. This runs only at image BUILD
# Fail fast if the pinned Factorio is not 2.1.24. This runs only at image BUILD
# time, which no PR does (#183) - so it is the last line of defence, not the
# first. Keep it in step with the FROM tag above.
RUN /opt/factorio/bin/x64/factorio --version | grep -q "Version: 2.1.23"
RUN /opt/factorio/bin/x64/factorio --version | grep -q "Version: 2.1.24"

WORKDIR /app
COPY render.mjs server.mjs ./
Expand Down
4 changes: 2 additions & 2 deletions preview-service/worker/worker-configuration.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* eslint-disable */
// Generated by Wrangler by running `wrangler types` (hash: affb4cd3651a5ac49a95d0f4eeaa69d9)
// Generated by Wrangler by running `wrangler types` (hash: 204fae83122dd4626fe92fe4ccb93cbf)
// Runtime types generated with [email protected] 2026-07-01 nodejs_compat
interface __BaseEnv_Env {
PREVIEW_CACHE: R2Bucket;
FACTORIO_VERSION: "2.1.23";
FACTORIO_VERSION: "2.1.24";
MONTHLY_RENDER_BUDGET: "5000";
ALLOWED_ORIGIN: "https://map.factorygamefan.com";
PREVIEW_CONTAINER: DurableObjectNamespace<import("./src/index").PreviewContainer>;
Expand Down
2 changes: 1 addition & 1 deletion preview-service/worker/wrangler.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// Stack traces in Workers Logs then name src/*.ts lines, not the bundle's.
"upload_source_maps": true,
"vars": {
"FACTORIO_VERSION": "2.1.23",
"FACTORIO_VERSION": "2.1.24",
"MONTHLY_RENDER_BUDGET": "5000",
"ALLOWED_ORIGIN": "https://map.factorygamefan.com",
},
Expand Down
Loading