chore: cleanup VirtioFS workarounds, parameterize PHP version, add Makefile, and fix minor issues#417
Closed
mortezamirkar wants to merge 18 commits into
Closed
Conversation
- fix typos and capitalization in Okta integration guide - change "methd" to "method" in Sign-in method line - change "OID - OpenID Connect" to "OIDC - OpenID Connect" - fix "Clinet Authentication" to "Client Authentication" - fix "Sig-in" to "Sign-in" - add missing "the" before Sign-in tab and capitalize consistently
- Create a link to troubleshooting section
- 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
- 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
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
The GUARD_COMMIT line was missing a trailing comma, inconsistent with the rest of the args blocks in docker-bake.hcl
ostefano
reviewed
Jun 3, 2026
ostefano
reviewed
Jun 3, 2026
ostefano
requested changes
Jun 3, 2026
Collaborator
ostefano
left a comment
ostefano
left a comment
There was a problem hiding this comment.
I like this thanks!
Just one comment that might require some spelunking (either git blame or github issues)
Collaborator
|
You could also split this PR, so we could merge the rest right now (and ADMIN_KEY issues postponed). |
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.
mortezamirkar
force-pushed
the
fix/virtiofs-php-makefile-cleanup
branch
from
45bd487 to
b1b54d2
Compare
Contributor
Author
|
@ostefano Fixed! I've replaced the two-line pattern with a single export that keeps AUTOCONF_ADMIN_KEY as an inline fallback: |
ostefano
approved these changes
Jun 3, 2026
ostefano
added
enhancement
Collaborator
|
Superseded by #421 Changes:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
safe_sed_i()function usingmktemp+catto replace the repetitivesed > tmp; cat tmp > file; rm tmpworkaround for VirtioFS (Docker Desktop for Mac). Replaceddd if=... of=...copies withcat ... > ...for clarity.PHP_PACKAGE_VERSIONbuild arg (default8.4) tocore/Dockerfile. Replaced 31 hardcoded references across Dockerfile, nginx config, and entrypoint scripts. Scripts now use version-agnosticphp-fpmcommand via build-time symlink. Nginx config uses@PHP_VERSION@placeholder templated at build time.Makefilewithbuild,build-core,build-modules,build-guard,build-slim,bake,up,down,logs,shellcheck,clean, andprunetargets.helpis the default.GUARD_COMMITin themisp-guardtarget args block.AUTOCONF_ADMIN_KEYwhich was only a fallback forAUTOGEN_ADMIN_KEY. Simplified to a singleAUTOGEN_ADMIN_KEY(defaulttrue).