Skip to content

2026.1 backports - #579

Merged
Alex-Welsh merged 6 commits into
stackhpc/2026.1from
2026.1-backports
Aug 6, 2026
Merged

2026.1 backports#579
Alex-Welsh merged 6 commits into
stackhpc/2026.1from
2026.1-backports

Conversation

@Alex-Welsh

Copy link
Copy Markdown
Member

6 cherry-picks from the master branch to improve kolla image builds for 2026.1

Add --buildkit flag to use docker buildx build instead of the docker-py
SDK. An optional --buildkit-builder selects a named buildx builder
instance, enabling docker-container or remote drivers for multi-arch
builds.

--buildkit and --squash are mutually exclusive and rejected at startup.
PushTask is skipped when buildkit is active; push is handled inline.

Set buildkit as the new default.

Change-Id: Idbf1d1bdc091bb84721f8006c2b916731b999859
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I7513f1ab627aa5137e16777ca6bee600e14a00e9
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
BaseOS and AppStream for CentOS/Rocky
ubuntu, ubuntu-security for Ubuntu
debian, debian-security for Debian

ubuntu-cloud-archive is not really a base repo - so
removing it from ubuntu.sources

Change-Id: Iab98de963f2e8532389b7563bb572d8aa20c7aa6
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
We don't use npm anywhere

Change-Id: Ibc1b213d575775f79fd5b7b6b8c6e21685fdb0b0
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Leaving empty CI template_overrides file in case
we need to use it in future.

Change-Id: Ic46f1a594bcc330536bc78d93ece10e60622f6d4
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Repos marked build_only: true are backed up before handle_repos()
overwrites them and restored at the end of each image build, so CI
mirror URLs are not baked into the final image.

The cleanup RUN was injected into every Dockerfile, not just images
that called handle_repos() for those repos. Child images with no
backup fell through to "rm -f", deleting the inherited repo file
(e.g. debian.sources in bifrost-base, breaking cpio install).

Fix by adding a {repo}.enabled sentinel that handle_repos creates
when it processes a build_only repo, making the cleanup conditional
on that sentinel.

Change-Id: Ie5b9970a4575b6258dc238059d3f33ddfe155789
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
@Alex-Welsh
Alex-Welsh requested a review from a team as a code owner August 6, 2026 07:49
@Alex-Welsh
Alex-Welsh merged commit d074c34 into stackhpc/2026.1 Aug 6, 2026
3 checks passed
@Alex-Welsh
Alex-Welsh deleted the 2026.1-backports branch August 6, 2026 08:46
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.

3 participants