Skip to content

Commit

Permalink
fix: Pin pip and setuptools to compatible versions (#883)
Browse files Browse the repository at this point in the history 
This fixes building the sandbox environment.
  • Loading branch information
@IdrisMiles
IdrisMiles committed Jan 29, 2021
1 parent 8b3e458 commit e2eef79
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions connectors/prometheus_metrics/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ RUN yum -y install \
python36-devel \
python36-pip

RUN python -m pip install --upgrade pip
RUN python -m pip install --upgrade 'pip<21'
RUN python3.6 -m pip install --upgrade pip

RUN python -m pip install --upgrade setuptools
RUN python -m pip install --upgrade 'setuptools<45'
RUN python3.6 -m pip install --upgrade setuptools

COPY LICENSE ./
Expand Down
4 changes: 2 additions & 2 deletions cueadmin/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ RUN yum -y install \
python36-devel \
python36-pip

RUN python -m pip install --upgrade pip
RUN python -m pip install --upgrade 'pip<21'
RUN python3.6 -m pip install --upgrade pip

RUN python -m pip install --upgrade setuptools
RUN python -m pip install --upgrade 'setuptools<45'
RUN python3.6 -m pip install --upgrade setuptools

COPY LICENSE ./
Expand Down
4 changes: 2 additions & 2 deletions cuegui/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ RUN yum -y install \
python36-devel \
python36-pip

RUN python -m pip install --upgrade pip
RUN python -m pip install --upgrade 'pip<21'
RUN python3.6 -m pip install --upgrade pip

RUN python -m pip install --upgrade setuptools
RUN python -m pip install --upgrade 'setuptools<45'
RUN python3.6 -m pip install --upgrade setuptools

RUN dbus-uuidgen > /etc/machine-id
Expand Down
4 changes: 2 additions & 2 deletions cuesubmit/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ RUN yum -y install \
python36-devel \
python36-pip

RUN python -m pip install --upgrade pip
RUN python -m pip install --upgrade 'pip<21'
RUN python3.6 -m pip install --upgrade pip

RUN python -m pip install --upgrade setuptools
RUN python -m pip install --upgrade 'setuptools<45'
RUN python3.6 -m pip install --upgrade setuptools

COPY LICENSE ./
Expand Down
4 changes: 2 additions & 2 deletions pycue/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ RUN yum -y install \
python36-devel \
python36-pip

RUN python -m pip install --upgrade pip
RUN python -m pip install --upgrade 'pip<21'
RUN python3.6 -m pip install --upgrade pip

RUN python -m pip install --upgrade setuptools
RUN python -m pip install --upgrade 'setuptools<45'
RUN python3.6 -m pip install --upgrade setuptools

COPY LICENSE ./
Expand Down
4 changes: 2 additions & 2 deletions pyoutline/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ RUN yum -y install \
python36-devel \
python36-pip

RUN python -m pip install --upgrade pip
RUN python -m pip install --upgrade 'pip<21'
RUN python3.6 -m pip install --upgrade pip

RUN python -m pip install --upgrade setuptools
RUN python -m pip install --upgrade 'setuptools<45'
RUN python3.6 -m pip install --upgrade setuptools

COPY LICENSE ./
Expand Down
4 changes: 2 additions & 2 deletions rqd/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ RUN yum -y install \
python36-devel \
python36-pip

RUN python -m pip install --upgrade pip
RUN python -m pip install --upgrade 'pip<21'
RUN python3.6 -m pip install --upgrade pip

RUN python -m pip install --upgrade setuptools
RUN python -m pip install --upgrade 'setuptools<45'
RUN python3.6 -m pip install --upgrade setuptools

WORKDIR /opt/opencue
Expand Down

0 comments on commit e2eef79

Please sign in to comment.