Skip to content

Include missing Container.scratch file in MANIFEST.in#1529

Merged
crivetimihai merged 1 commit intoIBM:multi-arch-buildsfrom
brian-hussey:bh/multi-arch-builds
Dec 1, 2025
Merged

Include missing Container.scratch file in MANIFEST.in#1529
crivetimihai merged 1 commit intoIBM:multi-arch-buildsfrom
brian-hussey:bh/multi-arch-builds

Conversation

@brian-hussey
Copy link
Copy Markdown
Member

🐛 Bug-fix PR

Before opening this PR please:

  1. make lint - passes ruff, mypy, pylint
  2. make test - all unit + integration tests green
  3. make coverage - ≥ 90 %
  4. make docker docker-run-ssl or make podman podman-run-ssl
  5. Update relevant documentation.
  6. Tested with sqlite and postgres + redis.
  7. Manual regression no longer fails. Ensure the UI and /version work correctly.

📌 Summary

Build failure in PR 1520 in the make verify stage.

🔁 Reproduction Steps

make venv install install-dev dist
make verify

The failing utility was check-manifest

🐞 Root Cause

MANIFEST.in does not cover the newly added Containerfile.scratch.
We may need to make some more generic rules for that later, but I don't want to create catchall rules that mean we might add something at a later stage.

💡 Fix Description

Include missing file in the MANIFEST.in file.

🧪 Verification

Check Command Status
Lint suite make lint
Unit tests make test
Coverage ≥ 90 % make coverage
Manual regression no longer fails steps / screenshots

📐 MCP Compliance (if relevant)

  • Matches current MCP spec
  • No breaking change to MCP clients

✅ Checklist

  • Code formatted (make black isort pre-commit)
  • No secrets/credentials committed

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
@brian-hussey brian-hussey marked this pull request as ready for review December 1, 2025 16:05
@crivetimihai crivetimihai merged commit 07e1433 into IBM:multi-arch-builds Dec 1, 2025
2 checks passed
@brian-hussey brian-hussey deleted the bh/multi-arch-builds branch December 1, 2025 16:10
kevalmahajan pushed a commit that referenced this pull request Dec 2, 2025
Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
kevalmahajan pushed a commit that referenced this pull request Dec 3, 2025
Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
kevalmahajan pushed a commit that referenced this pull request Dec 3, 2025
* feat: Add multiplatform container image support (amd64, arm64, s390x)

Add comprehensive multiplatform Docker build support with:

- New docker-multiplatform.yml workflow:
  - Parallel native builds for amd64 (ubuntu-latest) and arm64 (ubuntu-24.04-arm)
  - QEMU emulation for s390x on ubuntu-latest
  - Multiplatform manifest creation with buildx imagetools
  - Security scanning (Trivy, Grype, Syft SBOM) on amd64
  - Cosign keyless signing for all architectures

- Updated docker-release.yml:
  - Use buildx imagetools create for manifest handling
  - Preserves all architecture variants when tagging releases

- Updated ibm-cloud-code-engine.yml:
  - Explicit --platform linux/amd64 flag for consistent builds

- Updated Containerfile.lite for multiplatform compatibility:
  - Use ubi10-minimal as runtime base instead of scratch
  - Eliminates dnf --installroot which fails under QEMU emulation
  - Uses microdnf for runtime package installation
  - Maintains security scanning compatibility (RPM database preserved)

- Enhanced Makefile targets:
  - container-build-multi: Build multiplatform image locally
  - container-inspect-manifest: Inspect multiplatform manifest in registry

Closes #80

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

* Include missing Container.scratch file in MANIFEST.in (#1529)

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Update documentation for multi-architecture image use

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Revert unneeded changes in one part of the doc.

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Add recursive signing to cosign step.

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

---------

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
Co-authored-by: Mihai Criveti <crivetimihai@gmail.com>
kevalmahajan pushed a commit that referenced this pull request Dec 3, 2025
…#1520)

* feat: Add multiplatform container image support (amd64, arm64, s390x)

Add comprehensive multiplatform Docker build support with:

- New docker-multiplatform.yml workflow:
  - Parallel native builds for amd64 (ubuntu-latest) and arm64 (ubuntu-24.04-arm)
  - QEMU emulation for s390x on ubuntu-latest
  - Multiplatform manifest creation with buildx imagetools
  - Security scanning (Trivy, Grype, Syft SBOM) on amd64
  - Cosign keyless signing for all architectures

- Updated docker-release.yml:
  - Use buildx imagetools create for manifest handling
  - Preserves all architecture variants when tagging releases

- Updated ibm-cloud-code-engine.yml:
  - Explicit --platform linux/amd64 flag for consistent builds

- Updated Containerfile.lite for multiplatform compatibility:
  - Use ubi10-minimal as runtime base instead of scratch
  - Eliminates dnf --installroot which fails under QEMU emulation
  - Uses microdnf for runtime package installation
  - Maintains security scanning compatibility (RPM database preserved)

- Enhanced Makefile targets:
  - container-build-multi: Build multiplatform image locally
  - container-inspect-manifest: Inspect multiplatform manifest in registry

Closes #80

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

* Include missing Container.scratch file in MANIFEST.in (#1529)

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Bh/multi arch builds 2 (#1532)

* feat: Add multiplatform container image support (amd64, arm64, s390x)

Add comprehensive multiplatform Docker build support with:

- New docker-multiplatform.yml workflow:
  - Parallel native builds for amd64 (ubuntu-latest) and arm64 (ubuntu-24.04-arm)
  - QEMU emulation for s390x on ubuntu-latest
  - Multiplatform manifest creation with buildx imagetools
  - Security scanning (Trivy, Grype, Syft SBOM) on amd64
  - Cosign keyless signing for all architectures

- Updated docker-release.yml:
  - Use buildx imagetools create for manifest handling
  - Preserves all architecture variants when tagging releases

- Updated ibm-cloud-code-engine.yml:
  - Explicit --platform linux/amd64 flag for consistent builds

- Updated Containerfile.lite for multiplatform compatibility:
  - Use ubi10-minimal as runtime base instead of scratch
  - Eliminates dnf --installroot which fails under QEMU emulation
  - Uses microdnf for runtime package installation
  - Maintains security scanning compatibility (RPM database preserved)

- Enhanced Makefile targets:
  - container-build-multi: Build multiplatform image locally
  - container-inspect-manifest: Inspect multiplatform manifest in registry

Closes #80

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

* Include missing Container.scratch file in MANIFEST.in (#1529)

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Update documentation for multi-architecture image use

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Revert unneeded changes in one part of the doc.

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Add recursive signing to cosign step.

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

---------

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
Co-authored-by: Mihai Criveti <crivetimihai@gmail.com>

---------

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
Co-authored-by: Brian Hussey <brian.hussey@ie.ibm.com>
kcostell06 pushed a commit to kcostell06/mcp-context-forge that referenced this pull request Feb 24, 2026
…IBM#1520)

* feat: Add multiplatform container image support (amd64, arm64, s390x)

Add comprehensive multiplatform Docker build support with:

- New docker-multiplatform.yml workflow:
  - Parallel native builds for amd64 (ubuntu-latest) and arm64 (ubuntu-24.04-arm)
  - QEMU emulation for s390x on ubuntu-latest
  - Multiplatform manifest creation with buildx imagetools
  - Security scanning (Trivy, Grype, Syft SBOM) on amd64
  - Cosign keyless signing for all architectures

- Updated docker-release.yml:
  - Use buildx imagetools create for manifest handling
  - Preserves all architecture variants when tagging releases

- Updated ibm-cloud-code-engine.yml:
  - Explicit --platform linux/amd64 flag for consistent builds

- Updated Containerfile.lite for multiplatform compatibility:
  - Use ubi10-minimal as runtime base instead of scratch
  - Eliminates dnf --installroot which fails under QEMU emulation
  - Uses microdnf for runtime package installation
  - Maintains security scanning compatibility (RPM database preserved)

- Enhanced Makefile targets:
  - container-build-multi: Build multiplatform image locally
  - container-inspect-manifest: Inspect multiplatform manifest in registry

Closes IBM#80

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

* Include missing Container.scratch file in MANIFEST.in (IBM#1529)

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Bh/multi arch builds 2 (IBM#1532)

* feat: Add multiplatform container image support (amd64, arm64, s390x)

Add comprehensive multiplatform Docker build support with:

- New docker-multiplatform.yml workflow:
  - Parallel native builds for amd64 (ubuntu-latest) and arm64 (ubuntu-24.04-arm)
  - QEMU emulation for s390x on ubuntu-latest
  - Multiplatform manifest creation with buildx imagetools
  - Security scanning (Trivy, Grype, Syft SBOM) on amd64
  - Cosign keyless signing for all architectures

- Updated docker-release.yml:
  - Use buildx imagetools create for manifest handling
  - Preserves all architecture variants when tagging releases

- Updated ibm-cloud-code-engine.yml:
  - Explicit --platform linux/amd64 flag for consistent builds

- Updated Containerfile.lite for multiplatform compatibility:
  - Use ubi10-minimal as runtime base instead of scratch
  - Eliminates dnf --installroot which fails under QEMU emulation
  - Uses microdnf for runtime package installation
  - Maintains security scanning compatibility (RPM database preserved)

- Enhanced Makefile targets:
  - container-build-multi: Build multiplatform image locally
  - container-inspect-manifest: Inspect multiplatform manifest in registry

Closes IBM#80

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>

* Include missing Container.scratch file in MANIFEST.in (IBM#1529)

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Update documentation for multi-architecture image use

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Revert unneeded changes in one part of the doc.

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

* Add recursive signing to cosign step.

Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>

---------

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
Co-authored-by: Mihai Criveti <crivetimihai@gmail.com>

---------

Signed-off-by: Mihai Criveti <crivetimihai@gmail.com>
Signed-off-by: Brian Hussey <brian.hussey@ie.ibm.com>
Co-authored-by: Brian Hussey <brian.hussey@ie.ibm.com>
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