Update uwsgi image to python 3.10

OpenDev has stopped building python3.8 images at this point. This means
we need to update our Dockerfile to use a newer python version. In this
case python3.10 is chosen as it is newer but still easy to test on
Ubuntu. This will also update the version of uwsgi we are using.

Change-Id: I3eb4c580d854ebe0437114701d1b3f9c721e530e
This commit is contained in:
Clark Boylan 2022-11-10 09:39:32 -08:00
parent 9e2d54bb5a
commit b4e0cae3a3
4 changed files with 11 additions and 7 deletions

View File

@ -20,8 +20,8 @@
description: Build OpenDev Docker images for LodgeIt
dependencies: opendev-buildset-registry
requires:
- python-builder-3.8-bullseye-container-image
- uwsgi-base-3.8-bullseye-container-image
- python-builder-3.10-bullseye-container-image
- uwsgi-base-3.10-bullseye-container-image
provides: lodgeit-container-image
vars: &lodgeit_opendev_image_vars
zuul_work_dir: src/opendev.org/opendev/lodgeit
@ -36,8 +36,8 @@
description: Build OpenDev LodgeIt Docker images and upload to Docker Hub.
dependencies: opendev-buildset-registry
requires:
- python-builder-3.8-bullseye-container-image
- uwsgi-base-3.8-bullseye-container-image
- python-builder-3.10-bullseye-container-image
- uwsgi-base-3.10-bullseye-container-image
provides: lodgeit-container-image
vars: *lodgeit_opendev_image_vars
secrets:
@ -63,6 +63,7 @@
nodeset: ubuntu-bionic
- tox-py38:
nodeset: ubuntu-focal
- tox-py310
- opendev-buildset-registry
- lodgeit-build-opendev-image
gate:
@ -72,6 +73,7 @@
nodeset: ubuntu-bionic
- tox-py38:
nodeset: ubuntu-focal
- tox-py310
- opendev-buildset-registry
- lodgeit-upload-opendev-image
promote:

View File

@ -15,11 +15,11 @@
# Thu Dec 9 23:48:42 UTC 2021 Rebuild Timestamp
FROM opendevorg/python-builder:3.8-bullseye as builder
FROM opendevorg/python-builder:3.10-bullseye as builder
COPY . /tmp/src
RUN assemble
FROM opendevorg/uwsgi-base:3.8-bullseye as lodgeit
FROM opendevorg/uwsgi-base:3.10-bullseye as lodgeit
COPY --from=builder /output/ /output
RUN /output/install-from-bindep

View File

@ -14,6 +14,8 @@ classifier =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
[entry_points]
wsgi_scripts =
lodgeit-wsgi = lodgeit.application:make_app

View File

@ -1,6 +1,6 @@
[tox]
minversion = 1.6
envlist = pep8, py36, py38
envlist = pep8, py36, py38, py310
skipsdist = True
[testenv]