Skip to content

chore: cleanup VirtioFS workarounds, parameterize PHP version, add Makefile, and fix minor issues #421

Merged
ostefano merged 1 commit into
masterfrom
fix/virtio-rebased
Jun 4, 2026
Merged

chore: cleanup VirtioFS workarounds, parameterize PHP version, add Makefile, and fix minor issues #421
ostefano merged 1 commit into
masterfrom
fix/virtio-rebased

Conversation

@ostefano
Copy link
Copy Markdown
Collaborator

@ostefano ostefano commented Jun 4, 2026

Supersedes this: #417

CC @mortezamirkar

@ostefano ostefano force-pushed the fix/virtio-rebased branch 4 times, most recently from 6dc21be to 00e1517 Compare June 4, 2026 13:48
@ostefano ostefano changed the title Several changes chore: cleanup VirtioFS workarounds, parameterize PHP version, add Makefile, and fix minor issues Jun 4, 2026
@ostefano
Copy link
Copy Markdown
Collaborator Author

ostefano commented Jun 4, 2026

Additional changes:

  • Rebase
  • Build vars consistent

@ostefano ostefano force-pushed the fix/virtio-rebased branch from 00e1517 to 86d250d Compare June 4, 2026 13:52
@ostefano ostefano self-assigned this Jun 4, 2026
@ostefano ostefano force-pushed the fix/virtio-rebased branch from 86d250d to 6b7e975 Compare June 4, 2026 13:57
docs(readme): add docker hub note for pulling dependencies and base images

fix: add safe_sed_i helper and replace VirtioFS workarounds

- Add safe_sed_i() function using mktemp+cat pattern to replace
  the fragile sed > tmp; cat tmp > file; rm tmp workaround used
  for VirtioFS compatibility (Docker Desktop for Mac)
- Replace dd if=... of=... initial file copies with cat ... > ...
  for clearer intent
- Remove deprecated VirtioFS workaround comments referencing the
  Docker forum bug report

feat: parameterize hardcoded PHP 8.4 references via build arg

- Add PHP_PACKAGE_VERSION build arg (default 8.4) to core/Dockerfile
- Replace all php8.4 package names, binary paths, and config refs
  with php for single-point-of-change upgrades
- Create /usr/local/sbin/php-fpm symlink so entrypoint scripts
  use php-fpm instead of hardcoded versioned binary paths
- Use @PHP_VERSION@ placeholder in nginx config, templated at
  build time via sed
- Pass PHP_PACKAGE_VERSION to docker-compose build args
- Update entrypoint_fpm.sh and kubernetes/entrypoint_fpm.sh
  to use the version-agnostic php-fpm command

feat: add Makefile for common build and runtime tasks

Provides convenient targets for the most frequent operations:
- build, build-core, build-modules, build-guard, build-slim, bake
- up, down, logs for runtime management
- shellcheck, clean, prune for maintenance
- help target as default to list available commands

fix: restore AUTOCONF_ADMIN_KEY backward compat with cleaner pattern

Now uses a single export line that expands AUTOCONF_ADMIN_KEY
as an inline fallback, keeping backward compat for users with
AUTOCONF_ADMIN_KEY in their .env files.
@ostefano ostefano force-pushed the fix/virtio-rebased branch from 6b7e975 to 9b48ac3 Compare June 4, 2026 16:06
@ostefano ostefano merged commit a78937b into master Jun 4, 2026
5 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