opendev/system-config
Code Issues Proposed changes

Bump refstack to Bookworm and python3.11

Browse Source 
Refstack doesn't rely on much in the base operating system as far as I
can tell. That said refstack seems to test with python3.10 and not 3.11
so this may not work, but our testing should give us a good idea. Bump
these things up as we are updating all the services we can in order to
eventually cleanup image builds for old debian and old python.

Change-Id: Id39027691484e8f81bd097c174f0a4a1e81463af
This commit is contained in:
Clark Boylan 2023-09-19 10:22:56 -07:00
parent 2888408833
commit 00c098bcad
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/refstack/Dockerfile
View File

@ -16,14 +16,14 @@
# upload trigger - Thu 11 Aug 2022 16:11 PM UTC # upload trigger - Thu 11 Aug 2022 16:11 PM UTC
# refstack commit - f222f3fb9540f0df4bf0cb8736c2470740659b18 # refstack commit - f222f3fb9540f0df4bf0cb8736c2470740659b18
FROM opendevorg/python-builder:3.9-bullseye as builder FROM opendevorg/python-builder:3.11-bookworm as builder
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install git apt-utils python3-dev dh-python libc-dev-bin \ && apt-get -y install git apt-utils python3-dev dh-python libc-dev-bin \
libc6-dev libexpat1-dev libpython3-dev libpython3-dev linux-libc-dev \ libc6-dev libexpat1-dev libpython3-dev libpython3-dev linux-libc-dev \
apt-transport-https curl gnupg2 \ apt-transport-https curl gnupg2 \
&& curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo "deb https://deb.nodesource.com/node_16.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list \ && echo "deb https://deb.nodesource.com/node_18.x bookworm main" | tee /etc/apt/sources.list.d/nodesource.list \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
&& apt-get update \ && apt-get update \
@ -47,7 +47,7 @@ RUN python -m venv /tmp/venv \
&& /tmp/venv/bin/python /tmp/src/tools/convert-docs.py -o /tmp/src/refstack-ui/app/components/about/templates /tmp/src/doc/source/*.rst \ && /tmp/venv/bin/python /tmp/src/tools/convert-docs.py -o /tmp/src/refstack-ui/app/components/about/templates /tmp/src/doc/source/*.rst \
&& rm -rf /tmp/venv && rm -rf /tmp/venv
FROM opendevorg/python-base:3.9-bullseye as refstack FROM opendevorg/python-base:3.11-bookworm as refstack
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
COPY --from=builder /tmp/src/refstack-ui/app/ /refstack-ui/app COPY --from=builder /tmp/src/refstack-ui/app/ /refstack-ui/app
@ -59,4 +59,4 @@ RUN /output/install-from-bindep \
&& rm -rf /output && rm -rf /output
ENTRYPOINT ["/usr/bin/entrypoint"] ENTRYPOINT ["/usr/bin/entrypoint"]
CMD ["pecan", "serve", "/usr/local/lib/python3.9/site-packages/refstack/api/config.py"] CMD ["pecan", "serve", "/usr/local/lib/python3.11/site-packages/refstack/api/config.py"]

4
zuul.d/docker-images/refstack.yaml
View File

@ -4,8 +4,8 @@
description: Build a refstack image. description: Build a refstack image.
parent: system-config-build-image parent: system-config-build-image
requires: &refstack_requires requires: &refstack_requires
- python-base-3.9-bullseye-container-image - python-base-3.11-bookworm-container-image
- python-builder-3.9-bullseye-container-image - python-builder-3.11-bookworm-container-image
provides: refstack-container-image provides: refstack-container-image
vars: &refstack_vars vars: &refstack_vars
docker_images: docker_images: