diff --git a/docker/ircbot/Dockerfile b/docker/ircbot/Dockerfile index 9dec8f5750..ca91794218 100644 --- a/docker/ircbot/Dockerfile +++ b/docker/ircbot/Dockerfile @@ -13,19 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder +FROM docker.io/opendevorg/python-builder:3.12-bookworm as builder ARG ZUUL_SIBLINGS="" RUN apt-get update \ && apt-get -y install git -RUN git clone -b master-2023-05-27 https://github.com/ProgVal/Limnoria /tmp/src +RUN git clone -b master-2024-12-22 https://github.com/ProgVal/Limnoria /tmp/src COPY . /tmp/src RUN assemble -FROM docker.io/opendevorg/python-base:3.11-bookworm as ircbot +FROM docker.io/opendevorg/python-base:3.12-bookworm as ircbot COPY --from=builder /output /output diff --git a/zuul.d/docker-images/ircbot.yaml b/zuul.d/docker-images/ircbot.yaml index 49a061ba2c..82055be950 100644 --- a/zuul.d/docker-images/ircbot.yaml +++ b/zuul.d/docker-images/ircbot.yaml @@ -4,8 +4,8 @@ description: Build a ircbot image. parent: system-config-build-image requires: &ircbot_requires - - python-base-3.11-bookworm-container-image - - python-builder-3.11-bookworm-container-image + - python-base-3.12-bookworm-container-image + - python-builder-3.12-bookworm-container-image provides: ircbot-container-image required-projects: &ircbot_required_projects - opendev/meetbot diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index dbb4e50bcb..eba2168904 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -139,7 +139,9 @@ - system-config-build-image-ircbot: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-builder-3.11-bookworm + - name: system-config-build-image-python-builder-3.12-bookworm + soft: true + - name: system-config-build-image-python-base-3.12-bookworm soft: true - system-config-build-image-matrix-eavesdrop: dependencies: @@ -288,7 +290,9 @@ - system-config-upload-image-ircbot: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-builder-3.11-bookworm + - name: system-config-upload-image-python-builder-3.12-bookworm + soft: true + - name: system-config-upload-image-python-base-3.12-bookworm soft: true - system-config-upload-image-matrix-eavesdrop: dependencies: