Move statusbot to python3.11 and Bookworm

Time for our semi annual update to the base OS and python version. The
motivation here is that OpenDev would like to drop bullseye image builds
and older python image builds. Needs things to move off the old stuff
first.

Change-Id: I9156ef39ce8541dc77e08a4094dec1368bb02dc7
This commit is contained in:
Clark Boylan 2023-09-19 10:39:04 -07:00
parent 1885469fb0
commit 9e9f9fa108
3 changed files with 7 additions and 11 deletions

View File

@ -20,8 +20,8 @@
description: Build OpenDev Docker images for statusbot description: Build OpenDev Docker images for statusbot
provides: statusbot-container-image provides: statusbot-container-image
requires: requires:
- python-builder-3.10-bullseye-container-image - python-builder-3.11-bookworm-container-image
- python-base-3.10-bullseye-container-image - python-base-3.11-bookworm-container-image
vars: &statusbot_opendev_image_vars vars: &statusbot_opendev_image_vars
zuul_work_dir: src/opendev.org/opendev/statusbot zuul_work_dir: src/opendev.org/opendev/statusbot
docker_images: docker_images:
@ -35,8 +35,8 @@
description: Build OpenDev statusbot Docker images and upload to Docker Hub. description: Build OpenDev statusbot Docker images and upload to Docker Hub.
provides: statusbot-container-image provides: statusbot-container-image
requires: requires:
- python-builder-3.10-bullseye-container-image - python-builder-3.11-bookworm-container-image
- python-base-3.10-bullseye-container-image - python-base-3.11-bookworm-container-image
vars: *statusbot_opendev_image_vars vars: *statusbot_opendev_image_vars
secrets: secrets:
- name: docker_credentials - name: docker_credentials

View File

@ -13,12 +13,12 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this software. If not, see <http://www.gnu.org/licenses/>. # along with this software. If not, see <http://www.gnu.org/licenses/>.
FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
COPY . /tmp/src COPY . /tmp/src
RUN assemble RUN assemble
FROM docker.io/opendevorg/python-base:3.10-bullseye as statusbot FROM docker.io/opendevorg/python-base:3.11-bookworm as statusbot
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep RUN /output/install-from-bindep

View File

@ -13,11 +13,7 @@ classifier =
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.10
[entry_points] [entry_points]
console_scripts = console_scripts =