Skip to content

πŸ› fix(docker): update Alpine tzdata pin on main#533

Merged
scttbnsn merged 4 commits into
mainfrom
codex/main-tzdata-2026c
Jul 14, 2026
Merged

πŸ› fix(docker): update Alpine tzdata pin on main#533
scttbnsn merged 4 commits into
mainfrom
codex/main-tzdata-2026c

Conversation

@scttbnsn

@scttbnsn scttbnsn commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Summary

  • update the Alpine 3.21 tzdata pin from 2026b-r0 to the currently available 2026c-r0
  • add a regression that rejects the disappeared revision

Why

PR #532 exposed a deterministic fresh-build failure before Cucumber could start: Alpine now serves tzdata-2026c-r0, so the main Dockerfile pin to 2026b-r0 can no longer resolve. The retry failed identically.

This is the main forward-port of the already accepted v1.6 fix from #523. It intentionally does not import unrelated v1.6 Trivy or Alpine changes.

Verification

  • TDD red: Dockerfile defaults regression failed on 2026b-r0
  • targeted regression passes after the pin update
  • fresh local image build from exact main succeeds and installs tzdata 2026c-r0
  • independent audit confirms this two-file transplant is the minimal main-safe port; cherry-picking the dev commit wholesale would conflict with main-specific tests

After this merges, #532 will be rebased on the repaired main SHA and rerun.

Changelog

  • πŸ”§ Changed Alpine 3.21 tzdata pin in the main Dockerfile from 2026b-r0 to 2026c-r0.
  • ✨ Added a Docker regression test that parses the root Dockerfile base stage apk add line(s) to assert tzdata=2026c-r0 (including the exact trailing line continuation formatting) and to ensure tzdata=2026b-r0 is absent.
  • πŸ› Fixed deterministic fresh-build failures caused by the discontinued/unavailable tzdata package revision.

Concerns

  • Ensure the regression test continues to match the base stage apk add formatting exactly (including trailing line continuation).
  • Confirm CI passes with the updated Dockerfile parsing/assertion logic in app/configuration/dockerfile-defaults.test.ts.
  • Validate that fresh no-cache Linux/amd64 builds and runtime inspection both show tzdata-2026c-r0 installed.

@vercel

vercel Bot commented Jul 14, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
drydock-website Ready Ready Preview, Comment Jul 14, 2026 8:46am

@coderabbitai

coderabbitai Bot commented Jul 14, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. πŸŽ‰

ℹ️ Recent review info
βš™οΈ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 6ebd8527-63f4-427d-a27a-da0655237e4e

πŸ“₯ Commits

Reviewing files that changed from the base of the PR and between bcf089e and 7a67c21.

πŸ“’ Files selected for processing (1)
  • app/configuration/dockerfile-defaults.test.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • app/configuration/dockerfile-defaults.test.ts

πŸ“ Walkthrough

Walkthrough

The Dockerfile updates the Alpine tzdata package pin from 2026b-r0 to 2026c-r0. A Jest test verifies that the new pin is present in the base stage and the previous pin is absent.

Possibly related PRs

  • CodesWhat/drydock#523: Makes the same Dockerfile tzdata pin update and adds corresponding Jest validation.
πŸš₯ Pre-merge checks | βœ… 2
βœ… Passed checks (2 passed)
Check name Status Explanation
Linked Issues check βœ… Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check βœ… Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
πŸ“ Generate docstrings
  • Create stacked PR
  • Commit on current branch
πŸ§ͺ Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/main-tzdata-2026c

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 1

πŸ€– Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@app/configuration/dockerfile-defaults.test.ts`:
- Around line 10-14: Update the test covering the release image in the
base-stage assertion to extract or otherwise scope the Dockerfile content to the
base stage, then verify the exact apk package-install line pins tzdata to
2026c-r0. Keep the regression check rejecting 2026b-r0 within that scoped
install content rather than using document-wide toContain checks.
πŸͺ„ Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
βš™οΈ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 7a6c7eea-cc25-4043-b1e1-e3776c01b6f7

πŸ“₯ Commits

Reviewing files that changed from the base of the PR and between bdcb8d8 and 46cc75b.

πŸ“’ Files selected for processing (2)
  • Dockerfile
  • app/configuration/dockerfile-defaults.test.ts

Comment thread app/configuration/dockerfile-defaults.test.ts Outdated
@scttbnsn

Copy link
Copy Markdown
Contributor Author

Additional exact-head verification:

  • independent audit confirmed the two-file main transplant is minimal and safer than cherry-picking the dev commit
  • fresh no-cache linux/amd64 build with pull succeeds
  • runtime package inspection reports tzdata-2026c-r0
  • built image retains DD_VERSION=main-tzdata-forward-port

Hosted exact-head Cucumber remains the authoritative reproduction of the original failure.

@vercel

vercel Bot commented Jul 14, 2026

Copy link
Copy Markdown

Deployment failed with the following error:

Resource is limited - try again in 24 hours (more than 100, code: "api-deployments-free-per-day").

Learn More: https://vercel.com/codeswhat?upgradeToPro=build-rate-limit

@scttbnsn
scttbnsn enabled auto-merge (squash) July 14, 2026 08:52

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 1

πŸ€– Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@app/configuration/dockerfile-defaults.test.ts`:
- Line 16: Update the package-line assertion in the baseStage test to use `[
\t]+` instead of `\s+`, ensuring the regex matches only horizontal whitespace
around `tzdata=2026c-r0` and validates the exact continued package line.
πŸͺ„ Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
βš™οΈ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 88a7392b-913c-4a6b-98cb-38e66118b703

πŸ“₯ Commits

Reviewing files that changed from the base of the PR and between 46cc75b and bcf089e.

πŸ“’ Files selected for processing (2)
  • Dockerfile
  • app/configuration/dockerfile-defaults.test.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • Dockerfile

Comment thread app/configuration/dockerfile-defaults.test.ts Outdated
@scttbnsn
scttbnsn merged commit 73dcc10 into main Jul 14, 2026
24 of 26 checks passed
@scttbnsn
scttbnsn deleted the codex/main-tzdata-2026c branch July 14, 2026 09:44
scttbnsn added a commit that referenced this pull request Jul 14, 2026
…534)

The #523 tzdata `2026c-r0` pin landed on `dev/v1.6` without its
changelog bullet, so the dated `[1.6.0-rc.1]` section shipped no mention
of the image-build failure it fixes. This adds the bullet under
**Fixed**, next to the related Trivy image-digest entry, referencing
#523 and the post-GA main-side application #533.

Found by the 2026-07-14 release-train correctness review: the v1.6
release consolidation (#522) sources its tree from the accepted dev
head, so without this the rc.1 release notes silently omit a real
shipped fix.

Docs-only: no runtime change. Full local pre-push gate green (lint,
qlty, scripts/workflow tests, app+ui 100% coverage, builds, zizmor).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants