From a9dcd188828efbecd2e9cc946cbe9cde57f33581 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 18 Apr 2022 13:38:10 -0700 Subject: [PATCH] Update container image to bullseye and python3.9 We're trying to drop out the old images based on buster and 3.7 which storyboard has based its images on. Update storyboard to bullseye and python3.9 now that they have both been out for a while. Depends-On: https://review.opendev.org/c/opendev/storyboard/+/838409 Change-Id: Ibf5f3eb63e22eb5b37cdfa74fe3bb6ce1f31bb62 --- .zuul.yaml | 8 ++++---- Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index c4681084..e36e9264 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -28,8 +28,8 @@ dependencies: opendev-buildset-registry description: Build OpenDev Docker images for storyboard requires: - - python-base-container-image - - python-builder-container-image + - python-base-3.9-bullseye-container-image + - python-builder-3.9-bullseye-container-image provides: storyboard-container-image vars: &storyboard_opendev_image_vars zuul_work_dir: src/opendev.org/opendev/storyboard @@ -61,8 +61,8 @@ parent: opendev-upload-docker-image description: Build OpenDev storyboard 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: storyboard-container-image vars: *storyboard_opendev_image_vars secrets: diff --git a/Dockerfile b/Dockerfile index b7551c9c..c410c2fc 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 storyboard +FROM opendevorg/python-base:3.9-bullseye as storyboard COPY --from=builder /output/ /output RUN /output/install-from-bindep