airship
/
shipyard
Code Issues Proposed changes

[WIP] Gate fixes for Shipyard 

* Install older version of pip<21.0 for ubuntu_xenial images
* Install setuptools via pip for ubuntu_xenial images

Change-Id: Iee4ce59fdceacb165120a69d11c44e6e47feaea8
This commit is contained in:
anthony.bellino 2021-05-20 07:18:53 -07:00
parent 35e5a7f796
commit d07b5e44e8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
images/airflow/Dockerfile.ubuntu_xenial
View File

@ -69,13 +69,13 @@ RUN set -ex && \
netcat \
netbase \
python3 \
python3-setuptools \
python3-pip \
python3-dev \
python3-dateutil \
make \
--no-install-recommends \
&& python3 -m pip install -U pip \
&& python3 -m pip install -U 'pip<21.0' \
&& python3 -m pip install -U setuptools \
&& apt-get clean \
&& rm -rf \
/var/lib/apt/lists/* \

4
images/shipyard/Dockerfile.ubuntu_xenial
View File

@ -46,7 +46,6 @@ RUN set -ex && \
make \
netbase \
python3-dev \
python3-setuptools \
--no-install-recommends \
&& apt-get autoremove -yqq --purge \
&& apt-get clean \
@ -101,7 +100,8 @@ COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/
' \
&& apt-get -qq update \
&& apt-get -y install -y $buildDeps --no-install-recommends \
&& python3 -m pip install -U pip \
&& python3 -m pip install -U 'pip<21.0' \
&& python3 -m pip install -U setuptools \
&& pip3 install -r /home/shipyard/client_requirements.txt --no-cache-dir \
&& cd /home/shipyard/shipyard_client \
&& python3 setup.py install \