From 2c8e6764cc40ff95ace8f9903c444c9c6cc05eb1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 18 Apr 2022 13:35:50 -0700 Subject: [PATCH] Update the docker image to python3.9 and buster This is long overdue now that buster is out and python3.9 has been around for a bit. This update allows us to remove the buster 3.7 images that the gear images were based on. Depends-On: https://review.opendev.org/c/opendev/gear/+/838562 Change-Id: I8d57c06fe28276d6e15934a785b1f97125f0958f --- .zuul.yaml | 8 ++++---- Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 57e537c..84fb6da 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -19,8 +19,8 @@ parent: opendev-build-docker-image description: Build OpenDev Docker images for gear requires: - - python-base-container-image - - python-builder-container-image + - python-base-3.9-bullseye-container-image + - python-builder-3.9-bullseye-container-image provides: gear-container-image vars: &gear_opendev_image_vars zuul_work_dir: src/opendev.org/opendev/gear @@ -34,8 +34,8 @@ parent: opendev-upload-docker-image description: Build OpenDev gear Docker images and upload to Docker Hub. requires: - - python-base-container-image - - python-builder-container-image + - python-base-3.9-bullseye-container-image + - python-builder-3.9-bullseye-container-image provides: gear-container-image vars: *gear_opendev_image_vars secrets: diff --git a/Dockerfile b/Dockerfile index 13a86af..3c75b9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM opendevorg/python-builder as builder +FROM opendevorg/python-builder:3.9-bullseye as builder COPY . /tmp/src RUN assemble -FROM opendevorg/python-base as geard +FROM opendevorg/python-base:3.9-bullseye as geard COPY --from=builder /output/ /output RUN /output/install-from-bindep