Skip to content

refactor: consolidate to single Containerfile#5468

Merged
brian-hussey merged 3 commits into
mainfrom
jps-rationalize-containerfile
Jul 3, 2026
Merged

refactor: consolidate to single Containerfile#5468
brian-hussey merged 3 commits into
mainfrom
jps-rationalize-containerfile

Conversation

@jonpspri

@jonpspri jonpspri commented Jul 1, 2026

Copy link
Copy Markdown
Collaborator

Summary

Consolidates container build configuration to a single canonical , removing deprecated variants.

Changes

  • Removed: (old version) and
  • Renamed: → as the canonical multi-stage build
  • Updated: All 79 references across 29 files:
    • Docker Compose files ()
    • CI/CD configs (, )
    • Documentation (, , , )
    • Build configs (, , )
    • Test utilities and infrastructure files

Verification

  • ✅ All pre-commit hooks passed
  • ✅ YAML syntax validated with yamllint
  • ✅ No remaining references to in codebase
  • ✅ Proper indentation maintained in all YAML files

Impact

  • Simplifies build configuration
  • Reduces confusion about which Containerfile to use
  • Maintains all existing functionality
  • No breaking changes to build process

@brian-hussey brian-hussey left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @jonpspri, nicely put together.
I see only one issue with the MANIFEST.in I have a suggested change in the PR.

Once you've got that in we'll get this merged.

Thanks,
Brian

Comment thread MANIFEST.in Outdated
jonpspri and others added 3 commits July 3, 2026 15:38
- Remove deprecated Containerfile and Containerfile.scratch
- Rename Containerfile.lite to Containerfile as canonical build file
- Update all 79 references across 29 files:
  - Docker Compose files (docker-compose*.yml)
  - CI/CD configs (.travis.yml, fly.toml)
  - Documentation (README.md, docs/*, MULTIPLATFORM.md, CHANGELOG.md)
  - Build configs (Makefile, MANIFEST.in, whitesource.config)
  - Test utilities and infrastructure files

Closes #<issue-number-if-applicable>

Signed-off-by: Jonathan Springer <jps@s390x.com>
Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
- Update all GitHub Actions workflows to reference Containerfile
- Update self-references in Containerfile comments
- Leave CHANGELOG.md historical references unchanged

Signed-off-by: Jonathan Springer <jps@s390x.com>
Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
Given scope of this change, I'm applying the change now.

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
@brian-hussey brian-hussey force-pushed the jps-rationalize-containerfile branch from 7576b96 to 5847ddb Compare July 3, 2026 14:38
@brian-hussey brian-hussey self-requested a review July 3, 2026 14:38

@brian-hussey brian-hussey left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made change to MANIFEST.in, all good now.
Tested make verify and that Containerfile is exactly as the Containerfile.lite was (aside from internal comments in the file about the file name.

@brian-hussey brian-hussey added this pull request to the merge queue Jul 3, 2026
Merged via the queue into main with commit b5d53ae Jul 3, 2026
43 checks passed
@brian-hussey brian-hussey deleted the jps-rationalize-containerfile branch July 3, 2026 15:11
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