Repository navigation
chore: make master match the deployed awsdocker line - #4
Open
Alexanderamiri wants to merge 20 commits into
Open
Alexanderamiri wants to merge 20 commits into
Alexanderamiri wants to merge 20 commits into
Conversation
…run-local.sh for local setup
…e path handling due to ALB adding prefix to path
desiredCount to 2
Alexanderamiri
added this pull request to stack #9
October 24, 2026 13:32
Alexanderamiri
changed the title
Production (CloudFormation moresleepstack, last deployed 2026-08-19) runs the awsdocker branch, not master: webhooks, PATH_PREFIX, the 2026 config dates, the CDK stack and the SOPS image exist only there. Merge it so master is what runs in production before the platform pipeline starts deploying from master. The merge is clean. docker-compose.yaml, which awsdocker deleted, is kept: master's Build workflow starts the test database with it, and it is the local dev setup. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Alexanderamiri
force-pushed
the
platform/1-baseline
branch
from
October 24, 2026 13:36
3102b9d to
0ecd1d0
Compare
pom.xml declared maven-surefire-plugin twice: an empty entry and the
configured 2.19.1 one. Older Maven merged them with a warning; the Maven on
current GitHub runners rejects the POM ('must be unique'), so every build of
master fails before compiling. Keep only the configured declaration, which
is what Maven used anyway.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
maven.yaml pushed ghcr.io/javabin/moresleep:edge on every pull request run, so any open PR could replace the image other repos use for local development (javaBin/submittheforce compose.yaml). Push only for pushes and releases; pull requests still build and test. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
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
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.
Why
Production does not run
master. CloudFormation stackmoresleepstack(ECS clustermoresleep-test, 2 Fargate tasks behind Default-ALB forsleepingpill.javazone.no) was last deployed on 2026-08-19 from theawsdockerbranch. Only that branch has the webhooks (HOOK_WEB_ADDR),PATH_PREFIX, the 2026 config dates, the CDK stack and the SOPS image.The platform pipeline (PR 3, #6) deploys whatever is on the default branch. If master stayed behind, the first platform deploy would roll production back by several features.
What
A merge of
origin/awsdockerintomaster(git merge-tree: no conflicts). One deliberate difference from awsdocker:docker-compose.yaml, which awsdocker deleted, is kept. Master's existingBuildworkflow starts its test database with it, and it is the local dev setup.Second commit,
fix(build):pom.xmldeclaredmaven-surefire-plugintwice. The Maven on current GitHub runners rejects that POM, so master's ownBuildworkflow fails before it compiles anything, and the platform's build would fail the same way. The fix keeps only the configured declaration, which is what Maven used anyway.Third commit,
ci(build):maven.yamlpushedghcr.io/javabin/moresleep:edgeon every pull request run, so any open PR could replace the image other repos use for local development (javaBin/submittheforcecompose.yaml). It now pushes only for merged code and releases. Action item (not just a heads-up): this stack's own first CI runs (before this commit) overwrote:edgewith an image built from PR 4's unmerged branch, with migrations off.:edgehas not been restored yet. Ways to fix it: merging this PR rebuilds and pushes:edgefrommaster(master's own Build is broken today, so re-running an old master run doesn't help), or someone withwrite:packagesre-tags the previous digest. Until then, submittheforce's local compose gets that image; the javaBin/submittheforce maintainers should be told.How the platform piece works
Nothing platform-specific yet. The rule this sets up: on the platform, the default branch is production. Every push to
masteris built, tested, planned and deployed. Long-lived deploy branches likeawsdockergo away.How verified
git merge-tree master awsdocker: clean.Buildworkflow (maven.yaml: compose Postgres +mvn packagewith tests) on this PR. Result in the checks below.mvn verifyon the merged tree againstpostgres:17, using the same database and user asdocker/postgres(see PR 3).Merge when
Any time. This changes nothing that runs today: the CDK workflow is manual and takes a ref, and the old Elastic Beanstalk environment is dormant.
🤖 Generated with Claude Code