Skip to content

Commit bd2ccc0

Browse files
authored
Merge pull request #1622 from pshipton/pip
Use pip 25.2 until pip 25.3 is compatible with pep517
2 parents db60927 + 2e4d727 commit bd2ccc0

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

buildenv/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends python3 python3
3131
&& rm -rf /var/lib/apt/lists/* \
3232
&& sed -i 's|session required pam_loginuid.so|session optional pam_loginuid.so|g' /etc/pam.d/sshd \
3333
&& mkdir -p /var/run/sshd \
34-
&& pip3 install -U pip \
3534
&& pip3 install virtualenv \
3635
&& virtualenv myenv -p python3
3736
# Update LANG to fix error with pip-tools
3837
ENV LANG=C.UTF-8
3938
# Update path to include the virtual env install location
4039
ENV PATH /myenv/bin:$PATH
4140
# Activate the virtualenv environment, install build and test tools, create a new dependency list, and change permissions to ensure that Jenkins modify packages where necessary
42-
RUN /bin/bash -c "source /myenv/bin/activate && pip3 install setuptools pip-tools && pip3 install --requirement /tmp/requirements.txt && mv /tmp/requirements.txt /tmp/requirements.orig && pip-compile /tmp/requirements.in && chmod -R ugo+w /myenv"
41+
RUN /bin/bash -c "source /myenv/bin/activate && pip3 install 'pip<25.3' pip-tools setuptools && pip3 install --requirement /tmp/requirements.txt && mv /tmp/requirements.txt /tmp/requirements.orig && pip-compile /tmp/requirements.in && chmod -R ugo+w /myenv"
4342
# Setup jenkins user
4443
RUN useradd -m -d /home/jenkins -s /bin/sh jenkins \
4544
&& echo "jenkins:jenkinspass" | chpasswd \

0 commit comments

Comments
 (0)