opendev/system-config
Code Issues Proposed changes

Merge "Update matrix-eavesdrop image to bullseye"

Browse Source
This commit is contained in:
Zuul 2021-12-15 17:46:36 +00:00 committed by Gerrit Code Review
commit 29fbc1f078
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/matrix-eavesdrop/Dockerfile
View File

@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM docker.io/opendevorg/python-builder:3.9 as builder FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder
COPY src /tmp/src COPY src /tmp/src
RUN assemble RUN assemble
FROM docker.io/opendevorg/python-base:3.9 as eavesdrop FROM docker.io/opendevorg/python-base:3.9-bullseye as eavesdrop
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep \ RUN /output/install-from-bindep \

4
docker/matrix-eavesdrop/src/bindep.txt
View File

@ -1,7 +1,7 @@
gcc [compile test] gcc [compile test]
libc6-dev [compile test] libc6-dev [compile test]
libffi-dev [compile test] libffi-dev [compile test]
libolm-dev/buster-backports [compile test] libolm-dev [compile test]
make [compile test] make [compile test]
python3-dev [compile test] python3-dev [compile test]
libolm3/buster-backports libolm3

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

@ -4,8 +4,8 @@
description: Build a matrix-eavesdrop image. description: Build a matrix-eavesdrop image.
parent: system-config-build-image parent: system-config-build-image
requires: &matrix-eavesdrop_requires requires: &matrix-eavesdrop_requires
- python-base-3.9-buster-container-image - python-base-3.9-bullseye-container-image
- python-builder-3.9-buster-container-image - python-builder-3.9-bullseye-container-image
provides: matrix-eavesdrop-container-image provides: matrix-eavesdrop-container-image
vars: &matrix-eavesdrop_vars vars: &matrix-eavesdrop_vars
docker_images: docker_images:

4
zuul.d/project.yaml
View File

@ -143,7 +143,7 @@
- system-config-build-image-matrix-eavesdrop: - system-config-build-image-matrix-eavesdrop:
dependencies: dependencies:
- name: opendev-buildset-registry - name: opendev-buildset-registry
- name: system-config-build-image-python-builder-3.9-buster - name: system-config-build-image-python-builder-3.9-bullseye
soft: true soft: true
- system-config-build-image-python-base-3.7-buster - system-config-build-image-python-base-3.7-buster
- system-config-build-image-python-base-3.8-buster - system-config-build-image-python-base-3.8-buster
@ -293,7 +293,7 @@
- system-config-upload-image-matrix-eavesdrop: - system-config-upload-image-matrix-eavesdrop:
dependencies: dependencies:
- name: opendev-buildset-registry - name: opendev-buildset-registry
- name: system-config-upload-image-python-builder-3.9-buster - name: system-config-upload-image-python-builder-3.9-bullseye
soft: true soft: true
- system-config-upload-image-python-base-3.7-buster - system-config-upload-image-python-base-3.7-buster
- system-config-upload-image-python-base-3.8-buster - system-config-upload-image-python-base-3.8-buster