diff options
author | Clark Boylan <clark.boylan@gmail.com> | 2022-05-03 09:33:07 -0700 |
---|---|---|
committer | Clark Boylan <clark.boylan@gmail.com> | 2022-07-01 15:59:48 -0700 |
commit | d665053fe9b12bb237ffe810212772616a18ca64 (patch) | |
tree | 4eeb0fdfbbb44aa9ab064c417b15cbc8b8c432f3 /Dockerfile | |
parent | 4151f91684091411fc13c747fffe2114fdb4e25c (diff) | |
download | zuul-d665053fe9b12bb237ffe810212772616a18ca64.tar.gz |
Bump up to python3.10
This adds python3.10 testing on Jammy and switches the docker images to
python3.10 from 3.8.
We run sudo for postgres with -Hi to avoid non fatal errors when
postres' client attempts to write command history to Zuul's homedir (it
is running as the postgres user which can't write to zuul's homedir). We
also need to update the libffi package version for jammy to 8 in
bindep.txt. Finally, python_version values need to be quoted as "3.10"
is different than 3.10 which is equivalent to 3.1 when serialized by
yaml as a float.
Force setuptools to use stdlib (shipped by the distro) distutils to
avoid problems with virtualenvs not actually being virtualenvs.
Finally we switch the bulk of jobs over to using nodeset: ubuntu-jammy
as the default python there is 3.10.
Change-Id: I97b90bb7a23c90f108f23dda9fdd0e89f9f4dbca
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index d65a9746c..c6cc17651 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ COPY web /tmp/src # Explicitly run the Javascript build RUN cd /tmp/src && yarn install -d && yarn build -FROM docker.io/opendevorg/python-builder:3.8-bullseye as builder +FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder ENV DEBIAN_FRONTEND=noninteractive # Optional location of Zuul API endpoint. @@ -48,7 +48,7 @@ RUN /output/install-from-bindep \ && echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \ && tar xvfz openshift-client.tgz --strip-components=1 -C /tmp/openshift-install -FROM docker.io/opendevorg/python-base:3.8-bullseye as zuul +FROM docker.io/opendevorg/python-base:3.10-bullseye as zuul ENV DEBIAN_FRONTEND=noninteractive COPY --from=builder /output/ /output |