opendev
/
gear
Code Issues Proposed changes

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
This commit is contained in:
Clark Boylan 2022-04-18 13:35:50 -07:00 committed by Clark Boylan
parent aa21a0c61b
commit 2c8e6764cc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.zuul.yaml
View File

@ -19,8 +19,8 @@
parent: opendev-build-docker-image parent: opendev-build-docker-image
description: Build OpenDev Docker images for gear description: Build OpenDev Docker images for gear
requires: requires:
- python-base-container-image - python-base-3.9-bullseye-container-image
- python-builder-container-image - python-builder-3.9-bullseye-container-image
provides: gear-container-image provides: gear-container-image
vars: &gear_opendev_image_vars vars: &gear_opendev_image_vars
zuul_work_dir: src/opendev.org/opendev/gear zuul_work_dir: src/opendev.org/opendev/gear
@ -34,8 +34,8 @@
parent: opendev-upload-docker-image parent: opendev-upload-docker-image
description: Build OpenDev gear Docker images and upload to Docker Hub. description: Build OpenDev gear Docker images and upload to Docker Hub.
requires: requires:
- python-base-container-image - python-base-3.9-bullseye-container-image
- python-builder-container-image - python-builder-3.9-bullseye-container-image
provides: gear-container-image provides: gear-container-image
vars: *gear_opendev_image_vars vars: *gear_opendev_image_vars
secrets: secrets:

4
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 opendevorg/python-builder as builder FROM opendevorg/python-builder:3.9-bullseye as builder
COPY . /tmp/src COPY . /tmp/src
RUN assemble RUN assemble
FROM opendevorg/python-base as geard FROM opendevorg/python-base:3.9-bullseye as geard
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep RUN /output/install-from-bindep