Skip to content

Move service images to root level; set CakePHP path to /var/www/cakephp#223

Merged
b23prodtm merged 3 commits into
fix/composefrom
copilot/fixcompose
Jul 19, 2026
Merged

Move service images to root level; set CakePHP path to /var/www/cakephp#223
b23prodtm merged 3 commits into
fix/composefrom
copilot/fixcompose

Conversation

Copilot AI commented Jul 11, 2026

Copy link
Copy Markdown

Reorganizes the Docker service directories from deployment/images/ to root level, and standardizes the CakePHP installation path to /var/www/cakephp across all services.

Service directory restructure

  • git mv deployment/images/mysqldbmysqldb/
  • git mv deployment/images/httpdhttpd/
  • Removed empty deployment/ tree

CakePHP path: /var/www/html/var/www/cakephp

  • All php-fpm Dockerfiles (Dockerfile.{template,armhf,aarch64,x86_64}): updated ENV HTDOCS default
  • All httpd Dockerfiles (httpd/Dockerfile.*): updated ENV HTDOCS default
  • etc/php-fpm.d/www.conf: prefix = /var/www/cakephp (was /var/$pool/html) — aligns PHP-FPM chroot with new install path

Config/compose updates

  • docker-compose.{template,armhf,aarch64,x86_64,yml}: context, HTDOCS build arg, and www: volume mount updated
  • docker-bake.hcl: context paths ("mysqldb", "httpd") and HTDOCS args
  • common.env: BALENA_PROJECTS array updated to ( ./httpd ./mysqldb . ./balena-storage )
  • deploy.sh: mysqldb/conf.d/custom.cnf path
  • kubernetes/*/: service path references updated
# Before
db:
  build:
    context: deployment/images/mysqldb
php-fpm:
  build:
    args:
      HTDOCS: /var/www/html
  volumes:
    - www:/var/www/html

# After
db:
  build:
    context: mysqldb
php-fpm:
  build:
    args:
      HTDOCS: /var/www/cakephp
  volumes:
    - www:/var/www/cakephp

Both php-fpm and httpd share the www named volume mounted at /var/www/cakephp, so Apache can serve CakePHP static assets directly while proxying PHP requests to PHP-FPM.

Copilot AI requested a review from b23prodtm July 11, 2026 17:19
@b23prodtm
b23prodtm marked this pull request as ready for review July 19, 2026 15:57
@b23prodtm
b23prodtm merged commit 6c007a5 into fix/compose Jul 19, 2026
3 of 10 checks passed
@b23prodtm
b23prodtm deleted the copilot/fixcompose branch July 19, 2026 15:59
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.

2 participants