airship
/
shipyard
Code Issues Proposed changes

Gate fixes for Shipyard 

* Fixed typo for jsonschema version

* Setuptools version forced to <58 to allow usage of use_2to3, which
  some dependencies require

* Fixed scripting error that allowed Airflow installation to silently
  fail

Change-Id: I237801488795df07f2d4de1cde6cd4ec41182e31
This commit is contained in:
Maximilian Weiss 2021-09-09 19:43:20 +00:00
parent ac236ef52a
commit 88286bc690
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
images/airflow/Dockerfile.ubuntu_bionic
View File

@ -113,9 +113,9 @@ RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
COPY images/airflow/requirements.txt /tmp/ COPY images/airflow/requirements.txt /tmp/
RUN pip3 install -r /tmp/requirements.txt --no-cache-dir \ RUN 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) \
&& pip3 install --no-cache-dir --force-reinstall $(pip freeze | grep psycopg2-binary) || true && (pip3 install --no-cache-dir --force-reinstall $(pip freeze | grep psycopg2-binary) || true)
# Copy scripts used in the container: # Copy scripts used in the container:
COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/ COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/

8
images/airflow/Dockerfile.ubuntu_xenial
View File

@ -75,7 +75,7 @@ RUN set -ex && \
make \ make \
--no-install-recommends \ --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<58' \
&& apt-get clean \ && apt-get clean \
&& rm -rf \ && rm -rf \
/var/lib/apt/lists/* \ /var/lib/apt/lists/* \
@ -113,9 +113,9 @@ RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
COPY images/airflow/requirements.txt /tmp/ COPY images/airflow/requirements.txt /tmp/
RUN pip3 install -r /tmp/requirements.txt --no-cache-dir \ RUN 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) \
&& pip3 install --no-cache-dir --force-reinstall $(pip freeze | grep psycopg2-binary) || true && (pip3 install --no-cache-dir --force-reinstall $(pip freeze | grep psycopg2-binary) || true)
# Copy scripts used in the container: # Copy scripts used in the container:
COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/ COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/

2
images/airflow/requirements.txt
View File

@ -33,7 +33,7 @@ marshmallow-sqlalchemy==0.18.0
WTForms~=2.2.1 WTForms~=2.2.1
tabulate==0.8.03 tabulate==0.8.03
pbr==5.4.5 pbr==5.4.5
setuptools>=40.4.3 setuptools>=40.4.3,<58
six>=1.15.0 six>=1.15.0
urllib3==1.25.9 urllib3==1.25.9
vine<5.0.0a1,>=1.1.3 vine<5.0.0a1,>=1.1.3

2
src/bin/shipyard_airflow/requirements.txt
View File

@ -22,7 +22,7 @@ vine<5.0.0a1,>=1.1.3
configparser==3.5.0 configparser==3.5.0
cryptography>=2.7 cryptography>=2.7
falcon==1.4.1 falcon==1.4.1
jsonschema>=3.0.1<4 jsonschema>=3.0.1,<4
grpcio>=1.16.0 grpcio>=1.16.0
keystoneauth1>=3.18.0 keystoneauth1>=3.18.0
keystonemiddleware==5.3.0 keystonemiddleware==5.3.0