From e2e75358f304477ba1eaa9607bf56cc54dc93a6f Mon Sep 17 00:00:00 2001 From: Hongkai Liu Date: Fri, 3 Jul 2026 11:58:27 -0400 Subject: [PATCH 1/2] build an extra image rebasebot-podman --- .../openshift-eng-rebasebot-main.yaml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml b/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml index 55282b5672e4c..9310e5e4309fc 100644 --- a/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml +++ b/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml @@ -1,3 +1,8 @@ +base_images: + nested-podman: + name: nested-podman + namespace: ci + tag: latest build_root: project_image: dockerfile_literal: |- @@ -22,6 +27,24 @@ build_root: USER 1001:1001 images: items: + - dockerfile_literal: | + FROM nested-podman + USER root + RUN dnf install -y git go make tar gzip gpgme gpgme-devel pkgconfig jq python3.12 python3.12-devel python3.12-pip && dnf clean all + RUN ln -s /usr/bin/podman /usr/local/bin/docker + COPY src/ /src/ + WORKDIR /src/rebasebot + RUN python3.12 -m pip install --no-cache-dir uv && python3.12 -m pip install . + WORKDIR /working + RUN rm -rf /src && chmod -R a+rwX,o-w /working + USER 1001:1001 + from: nested-podman + inputs: + src: + paths: + - destination_dir: src + source_path: /go/src/github.com/openshift-eng/rebasebot + to: rebasebot-podman - dockerfile_path: Containerfile to: rebasebot promotion: From 44280fe7c8615f0e9c3856a116c3279e825c9260 Mon Sep 17 00:00:00 2001 From: Hongkai Liu Date: Fri, 3 Jul 2026 14:01:45 -0400 Subject: [PATCH 2/2] dnf install only python3.12 We can install others on demand later. --- .../openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml b/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml index 9310e5e4309fc..49bc2d5af7e46 100644 --- a/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml +++ b/ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml @@ -30,7 +30,7 @@ images: - dockerfile_literal: | FROM nested-podman USER root - RUN dnf install -y git go make tar gzip gpgme gpgme-devel pkgconfig jq python3.12 python3.12-devel python3.12-pip && dnf clean all + RUN dnf install -y python3.12 python3.12-devel python3.12-pip && dnf clean all RUN ln -s /usr/bin/podman /usr/local/bin/docker COPY src/ /src/ WORKDIR /src/rebasebot