diff --git a/.zuul.yaml b/.zuul.yaml index ce77966..c2648b8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -19,6 +19,9 @@ parent: opendev-build-docker-image description: Build OpenDev Docker images for statusbot provides: statusbot-container-image + requires: + - python-builder-3.10-bullseye-container-image + - python-base-3.10-bullseye-container-image vars: &statusbot_opendev_image_vars zuul_work_dir: src/opendev.org/opendev/statusbot docker_images: @@ -31,6 +34,9 @@ parent: opendev-upload-docker-image description: Build OpenDev statusbot Docker images and upload to Docker Hub. provides: statusbot-container-image + requires: + - python-builder-3.10-bullseye-container-image + - python-base-3.10-bullseye-container-image vars: *statusbot_opendev_image_vars secrets: - name: docker_credentials diff --git a/Dockerfile b/Dockerfile index c977ecc..994ffb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,12 @@ # You should have received a copy of the GNU General Public License # along with this software. If not, see . -FROM opendevorg/python-builder:3.8 as builder +FROM opendevorg/python-builder:3.10-bullseye as builder COPY . /tmp/src RUN assemble -FROM opendevorg/python-base:3.8 as statusbot +FROM opendevorg/python-base:3.10-bullseye as statusbot COPY --from=builder /output/ /output RUN /output/install-from-bindep diff --git a/setup.cfg b/setup.cfg index 1f1152c..46112bc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,6 +17,7 @@ classifier = Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.10 [entry_points] console_scripts =