Skip to content

Update CI - #7

Merged
artemnikitin merged 5 commits into
mainfrom
fix/overlay-docs
Jun 17, 2026
Merged

Update CI#7
artemnikitin merged 5 commits into
mainfrom
fix/overlay-docs

Conversation

@artemnikitin

@artemnikitin artemnikitin commented Jun 7, 2026

Copy link
Copy Markdown
Owner

Summary

  • Apply shared and tenant-specific config overlays in deterministic order: configs/<service>/ first, then configs/<tenant>-<service>/ on top.
  • Move the image pipeline logic out of GitHub Actions into reusable shell scripts with a thin Makefile entrypoint.
  • Run make build on pull requests, and run both make build and make push only for pushes to main.
  • Update README and AGENTS guidance to match the new pipeline and validation flow.

Details

  • scripts/build-images.sh resolves fc-init, reads tenant service YAML, computes overlay arguments, and builds all tenant rootfs images.
  • scripts/push-images.sh uploads generated *-rootfs.ext4 artifacts to S3.
  • scripts/docker-to-rootfs.sh now accepts colon-separated overlay directories and applies them in order.
  • The workflow now delegates build/upload behavior to make build and make push instead of carrying the shell logic inline.

artemnikitin and others added 5 commits June 7, 2026 17:49
The build-images workflow selects exactly one overlay directory (tenant-specific
if it exists, otherwise shared) rather than applying both in layers. Update the
README to match the actual either/or behavior.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Previously the workflow selected only one overlay directory (tenant-specific
if present, otherwise shared), so shared configs were silently skipped whenever
a tenant-specific overlay existed.

Change docker-to-rootfs.sh to accept a colon-separated list of overlay
directories and apply them in order (later entries override earlier ones).
Update the workflow to build the colon-separated path when both a shared and
a tenant-specific overlay exist, so shared configs serve as the baseline and
tenant-specific configs override them. Also update the README to reflect the
correct layered behavior.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@artemnikitin artemnikitin changed the title Fix overlay ordering Update CI Jun 16, 2026
@artemnikitin
artemnikitin marked this pull request as ready for review June 17, 2026 06:50
@artemnikitin
artemnikitin merged commit d7be4bf into main Jun 17, 2026
1 check passed
@artemnikitin
artemnikitin deleted the fix/overlay-docs branch June 17, 2026 06:51
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