cloud-hosting-platform/cloud-apache-container
6
0 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

build: arch-aware mariadb.repo + lsphp index lookup (amd64 unchanged) [skip ci] #37

Merged
jknapp merged 1 commits from fix/arch-aware-mariadb-repo-lsphp into trunk 2026-11-12 01:15:07 +00:00
Conversation 0 Commits 1 Files Changed 6
+73 -6
jknapp commented 2026-11-12 01:01:38 +00:00
Owner
Copy link
Copy source

T4a of the multi-arch image plan. No behaviour change on amd64.

  • Dockerfile, Dockerfile.fpm: after COPY, sed rewrites -amd64 to -$(uname -m | sed s/x86_64/amd64/). amd64 result is byte-identical (sha256 eb90f4c0... both before/after); arm64 yields rhel$releasever-aarch64 (HTTP 302 on mirror; x86_64 is 404 so $basearch is unusable). uname -m chosen over TARGETARCH: works with no ARG declaration and under legacy builder.
  • scripts/lsphp-repo-version.sh PHPVER [ARCH] replaces the 3 inline binary-amd64 lookups (build-push.yaml x2, lsphp-source-emergency.yaml); default arch amd64 (or LSPHP_ARCH). Fixture test scripts/tests/lsphp-repo-version.test.sh added to Shell-Checks.
  • Not changed: scripts/install-php85.sh (not referenced by any Dockerfile).

Merge advice: merging to trunk triggers build-push.yaml (push to trunk) for the whole image matrix. Image content is unchanged on amd64, so merge with [skip ci] in the merge title.

🤖 Generated with Claude Code

https://claude.ai/code/session_0185ukXjXyosSkunDsdWz3mb

T4a of the multi-arch image plan. No behaviour change on amd64. - `Dockerfile`, `Dockerfile.fpm`: after COPY, `sed` rewrites `-amd64` to `-$(uname -m | sed s/x86_64/amd64/)`. amd64 result is byte-identical (sha256 eb90f4c0... both before/after); arm64 yields `rhel$releasever-aarch64` (HTTP 302 on mirror; `x86_64` is 404 so `$basearch` is unusable). uname -m chosen over TARGETARCH: works with no ARG declaration and under legacy builder. - `scripts/lsphp-repo-version.sh PHPVER [ARCH]` replaces the 3 inline `binary-amd64` lookups (build-push.yaml x2, lsphp-source-emergency.yaml); default arch amd64 (or `LSPHP_ARCH`). Fixture test `scripts/tests/lsphp-repo-version.test.sh` added to Shell-Checks. - Not changed: `scripts/install-php85.sh` (not referenced by any Dockerfile). **Merge advice:** merging to trunk triggers build-push.yaml (push to trunk) for the whole image matrix. Image content is unchanged on amd64, so merge with `[skip ci]` in the merge title. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_0185ukXjXyosSkunDsdWz3mb
jknapp added 1 commit 2026-11-12 01:01:38 +00:00
build: arch-aware mariadb.repo and lsphp index lookup (amd64 unchanged) ad66667053 
- Dockerfile, Dockerfile.fpm: select rhel$releasever-<amd64|aarch64> from uname -m
  (amd64 file is byte-identical; $basearch cannot be used, x86_64 path 404s).
- scripts/lsphp-repo-version.sh replaces three inline binary-amd64 lookups
  (build-push.yaml x2, lsphp-source-emergency.yaml); arch defaults to amd64.
- fixture test wired into Shell-Checks.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0185ukXjXyosSkunDsdWz3mb
jknapp merged commit 4b35869477 into trunk 2026-11-12 01:15:07 +00:00
jknapp deleted branch fix/arch-aware-mariadb-repo-lsphp 2026-11-12 01:15:07 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
hub-agent Bot jknapp renovate-bot (Renovate Bot) whmcs-sam whp-cicd-user whp-deploy
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: cloud-hosting-platform/cloud-apache-container#37