opendev/system-config
Code Issues Proposed changes

Merge "Build gerrit image with python base from quay.io"

Browse Source
This commit is contained in:
Zuul
2025-09-15 20:59:27 +00:00
committed by Gerrit Code Review
parent b2e1a67ce7 5ca652888e
commit 1a115fb02b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/gerrit/base/Dockerfile
View File

@@ -15,12 +15,12 @@
# Fri Aug 15 04:20:25 PM UTC 2025 - trigger rebuild # Fri Aug 15 04:20:25 PM UTC 2025 - trigger rebuild
FROM docker.io/opendevorg/python-builder:3.12-bookworm as builder FROM quay.io/opendevorg/python-builder:3.12-bookworm as builder
COPY . /tmp/src COPY . /tmp/src
RUN assemble RUN assemble
FROM docker.io/opendevorg/python-base:3.12-bookworm as gerrit-base FROM quay.io/opendevorg/python-base:3.12-bookworm as gerrit-base
RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends

4
zuul.d/docker-images/gerrit.yaml
View File

@@ -14,6 +14,7 @@
- playbooks/zuul/gerrit/base.yaml - playbooks/zuul/gerrit/base.yaml
vars: &gerrit-base_vars vars: &gerrit-base_vars
promote_container_image_job: system-config-upload-image-gerrit-base promote_container_image_job: system-config-upload-image-gerrit-base
container_command: docker
container_images: container_images:
- context: docker/gerrit/base - context: docker/gerrit/base
registry: quay.io registry: quay.io
@@ -109,6 +110,7 @@
override-checkout: v3.10.8 override-checkout: v3.10.8
vars: &gerrit_vars_3_10 vars: &gerrit_vars_3_10
promote_container_image_job: system-config-upload-image-gerrit-3.10 promote_container_image_job: system-config-upload-image-gerrit-3.10
container_command: docker
container_images: container_images:
- context: docker/gerrit/bazel - context: docker/gerrit/bazel
registry: quay.io registry: quay.io
@@ -210,6 +212,7 @@
override-checkout: v3.11.5 override-checkout: v3.11.5
vars: &gerrit_vars_3_11 vars: &gerrit_vars_3_11
promote_container_image_job: system-config-upload-image-gerrit-3.11 promote_container_image_job: system-config-upload-image-gerrit-3.11
container_command: docker
container_images: container_images:
- context: docker/gerrit/bazel - context: docker/gerrit/bazel
registry: quay.io registry: quay.io
@@ -296,6 +299,7 @@
vars: &gerrit_vars_master vars: &gerrit_vars_master
zuul_work_dir: src/opendev.org/opendev/system-config zuul_work_dir: src/opendev.org/opendev/system-config
promote_container_image_job: system-config-upload-image-gerrit-master promote_container_image_job: system-config-upload-image-gerrit-master
container_command: docker
container_images: container_images:
- context: docker/gerrit/bazel - context: docker/gerrit/bazel
registry: quay.io registry: quay.io