Skip to content

Commit e2eef79

Browse files
authored
fix: Pin pip and setuptools to compatible versions (AcademySoftwareFoundation#883)
This fixes building the sandbox environment.
1 parent 8b3e458 commit e2eef79

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

connectors/prometheus_metrics/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ RUN yum -y install \
1515
python36-devel \
1616
python36-pip
1717

18-
RUN python -m pip install --upgrade pip
18+
RUN python -m pip install --upgrade 'pip<21'
1919
RUN python3.6 -m pip install --upgrade pip
2020

21-
RUN python -m pip install --upgrade setuptools
21+
RUN python -m pip install --upgrade 'setuptools<45'
2222
RUN python3.6 -m pip install --upgrade setuptools
2323

2424
COPY LICENSE ./

cueadmin/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ RUN yum -y install \
1919
python36-devel \
2020
python36-pip
2121

22-
RUN python -m pip install --upgrade pip
22+
RUN python -m pip install --upgrade 'pip<21'
2323
RUN python3.6 -m pip install --upgrade pip
2424

25-
RUN python -m pip install --upgrade setuptools
25+
RUN python -m pip install --upgrade 'setuptools<45'
2626
RUN python3.6 -m pip install --upgrade setuptools
2727

2828
COPY LICENSE ./

cuegui/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ RUN yum -y install \
2626
python36-devel \
2727
python36-pip
2828

29-
RUN python -m pip install --upgrade pip
29+
RUN python -m pip install --upgrade 'pip<21'
3030
RUN python3.6 -m pip install --upgrade pip
3131

32-
RUN python -m pip install --upgrade setuptools
32+
RUN python -m pip install --upgrade 'setuptools<45'
3333
RUN python3.6 -m pip install --upgrade setuptools
3434

3535
RUN dbus-uuidgen > /etc/machine-id

cuesubmit/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ RUN yum -y install \
2020
python36-devel \
2121
python36-pip
2222

23-
RUN python -m pip install --upgrade pip
23+
RUN python -m pip install --upgrade 'pip<21'
2424
RUN python3.6 -m pip install --upgrade pip
2525

26-
RUN python -m pip install --upgrade setuptools
26+
RUN python -m pip install --upgrade 'setuptools<45'
2727
RUN python3.6 -m pip install --upgrade setuptools
2828

2929
COPY LICENSE ./

pycue/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ RUN yum -y install \
1919
python36-devel \
2020
python36-pip
2121

22-
RUN python -m pip install --upgrade pip
22+
RUN python -m pip install --upgrade 'pip<21'
2323
RUN python3.6 -m pip install --upgrade pip
2424

25-
RUN python -m pip install --upgrade setuptools
25+
RUN python -m pip install --upgrade 'setuptools<45'
2626
RUN python3.6 -m pip install --upgrade setuptools
2727

2828
COPY LICENSE ./

pyoutline/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ RUN yum -y install \
1919
python36-devel \
2020
python36-pip
2121

22-
RUN python -m pip install --upgrade pip
22+
RUN python -m pip install --upgrade 'pip<21'
2323
RUN python3.6 -m pip install --upgrade pip
2424

25-
RUN python -m pip install --upgrade setuptools
25+
RUN python -m pip install --upgrade 'setuptools<45'
2626
RUN python3.6 -m pip install --upgrade setuptools
2727

2828
COPY LICENSE ./

rqd/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ RUN yum -y install \
1212
python36-devel \
1313
python36-pip
1414

15-
RUN python -m pip install --upgrade pip
15+
RUN python -m pip install --upgrade 'pip<21'
1616
RUN python3.6 -m pip install --upgrade pip
1717

18-
RUN python -m pip install --upgrade setuptools
18+
RUN python -m pip install --upgrade 'setuptools<45'
1919
RUN python3.6 -m pip install --upgrade setuptools
2020

2121
WORKDIR /opt/opencue

0 commit comments

Comments
 (0)