airship/shipyard
Code Issues Proposed changes

[shipyard] Fix pyOpenSSL issue in xenial images

Browse Source 
Change-Id: I4c57f92b56a2956497bf6466e23afdfb9af8080f
This commit is contained in:
Markin, Sergiy (sm515x) 2022-09-23 14:11:38 +00:00
parent ad19720444
commit a3d60cfbc8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
images/airflow/Dockerfile.ubuntu_xenial
View File

@ -72,6 +72,7 @@ RUN set -ex && \
python3-pip \ python3-pip \
python3-dev \ python3-dev \
python3-dateutil \ python3-dateutil \
python3-openssl \
make \ make \
--no-install-recommends \ --no-install-recommends \
&& python3 -m pip install -U 'pip<21.0' \ && python3 -m pip install -U 'pip<21.0' \
@ -111,7 +112,8 @@ RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
# https://github.com/puckel/docker-airflow/issues/77 # https://github.com/puckel/docker-airflow/issues/77
# Install Airflow directly to allow overriding source # Install Airflow directly to allow overriding source
COPY images/airflow/requirements.txt /tmp/ COPY images/airflow/requirements.txt /tmp/
RUN pip3 install -r /tmp/requirements.txt --no-cache-dir \ RUN sed -i "s/pyOpenSSL==.*//" /tmp/requirements.txt \
&& pip3 install -r /tmp/requirements.txt --no-cache-dir \
&& pip3 install $AIRFLOW_SRC --no-cache-dir \ && pip3 install $AIRFLOW_SRC --no-cache-dir \
&& (pip3 uninstall -y snakebite || true) \ && (pip3 uninstall -y snakebite || true) \
&& (pip3 uninstall -y psycopg2 || true) \ && (pip3 uninstall -y psycopg2 || true) \

11
images/shipyard/Dockerfile.ubuntu_xenial
View File

@ -99,12 +99,15 @@ COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/
python3-pip \ python3-pip \
' \ ' \
&& apt-get -qq update \ && apt-get -qq update \
&& apt-get -y install -y $buildDeps --no-install-recommends \ && apt-get -y install -y \
$buildDeps \
python3-openssl \
libffi-dev \
python3-dev \
--no-install-recommends \
&& python3 -m pip install -U 'pip<21.0' \ && python3 -m pip install -U 'pip<21.0' \
&& python3 -m pip install -U setuptools \ && python3 -m pip install -U setuptools \
&& pip3 install -r /home/shipyard/client_requirements.txt --no-cache-dir \ && sed -i "s/pyOpenSSL==.*//" /home/shipyard/client_requirements.txt\
&& cd /home/shipyard/shipyard_client \
&& python3 setup.py install \
&& pip3 install -r /home/shipyard/api_requirements.txt --no-cache-dir \ && pip3 install -r /home/shipyard/api_requirements.txt --no-cache-dir \
&& cd /home/shipyard/shipyard \ && cd /home/shipyard/shipyard \
&& python3 setup.py install \ && python3 setup.py install \