Conversation
…ends
[GOVCMS-15421]
Split the monolithic docker-compose.yml into a static root file plus
opt-in fragments under .docker/compose/, so it no longer needs to be
mutated per project. Previously, scripts/scaffold-init.sh sed-substituted
{{ }} tokens and swapped YAML anchors directly in docker-compose.yml, and
CI stripped lines by ### comment marker - meaning no upstream diff could
apply cleanly across the projects built from this scaffold.
- cli/nginx/php/test/chrome now extend shared service definitions from
.docker/compose/_common.{default,paas}.yml, selected via GOVCMS_VOLUMES
in .env instead of a sed'd anchor swap.
- test, chrome, solr and redis become opt-in via `include:` entries;
test and chrome are additionally gated behind the "test" Compose
profile since they're local/CI-only and must never deploy.
- mariadb gets a healthcheck (mysqladmin ping) replacing the imperative
`dockerize -wait` exec into the test service from ahoy up/build.
- Local-only SSH-agent mounting moves from ###-marked lines to
.docker/compose/local.yml, loaded via COMPOSE_FILE in .env - freeing
docker-compose.override.yml for projects' own overrides.
- ahoy commands that exec into test (lint, test-behat, test-phpunit,
debug) now bring it up under its profile first.
This is a draft example for a Lagoon maintainer to validate parser
support for include/extends/profiles against - not yet merged to
develop/main.
yusufhm
changed the title
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
1 participant
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.
[GOVCMS-15421]
Split the monolithic
docker-compose.ymlinto a static root file plus opt-in fragments under.docker/compose/, so it no longer needs to be mutated per project. Previously,scripts/scaffold-init.shsed-substituted{{ }}tokens and swapped YAML anchors directly indocker-compose.yml, and CI stripped lines by###comment marker - meaning no upstream diff could apply cleanly across the projects built from this scaffold..docker/compose/_common.{default,paas}.yml, selected viaGOVCMS_VOLUMESin .env instead of a sed'd anchor swap.include:entries; test and chrome are additionally gated behind the "test" Compose profile since they're local/CI-only and must never deploy.dockerize -waitexec into the test service from ahoy up/build.###-marked lines to.docker/compose/local.yml, loaded via COMPOSE_FILE in.env- freeingdocker-compose.override.ymlfor projects' own overrides.This is a draft example for a Lagoon maintainer to validate parser support for include/extends/profiles against - not yet merged to develop/main.