Skip to content

Align the Dockerfiles and the CI with the PHP images - #40

Merged
mistraloz merged 2 commits into
thecodingmachine:masterfrom
mistraloz:chore/align-with-php-images
Nov 13, 2026
Merged

mistraloz merged 2 commits into
thecodingmachine:masterfrom
mistraloz:chore/align-with-php-images

Conversation

@mistraloz

Copy link
Copy Markdown
Contributor

The scheduled run of 2026-11-08 failed on a 504 of github.com while downloading supercronic. This PR adds retries and aligns the images with what the PHP images (v5) already do.

Dockerfiles (utils/Dockerfile.blueprint)

  • curl --retry 5 --retry-delay 2 for supercronic and the NodeSource key
  • supercronic v0.1.12 → v0.2.49 (same as the PHP images), with a SHA1 check for amd64 and arm64
  • SHELL ["/bin/bash", "-o", "pipefail", "-c"]: a failing curl | gpg now fails the build. Bash's echo does not interpret \t, so the Apache conf is written with printf
  • ENV key=value syntax (removes the legacy syntax warning)

CI

  • actions/checkout@v7, docker/setup-qemu-action@v4, docker/setup-buildx-action@v4, docker/login-action@v4 (the v1 actions run on the deprecated Node 20)
  • New check_blueprint.yml: regenerates the Dockerfiles with orbit and fails if they differ from the committed ones
  • build-and-test.sh: the apache variants are now started and must serve an index.html (nothing tested that Apache starts)

Tested locally

  • 24-apache-trixie and 26-trixie-build: build, SHA1 check, Apache serving a page, uid and cron tests (the log format of supercronic 0.2 is unchanged)

- Retry the downloads of supercronic and of the NodeSource key
- Upgrade supercronic to v0.2.49 and check its SHA1
- Build with bash -o pipefail (printf for the tabs of the Apache conf)
- Use the ENV key=value syntax
- Test that Apache serves the files of the working directory
@mistraloz
mistraloz merged commit ac478cb into thecodingmachine:master Nov 13, 2026
17 checks passed
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.

1 participant