airship/shipyard
Code Issues Proposed changes

(fix) Updated WTForms and cleaned psycopg2

Browse Source 
1. Locked the WTForms to 2.2.1 to address the import issue with
   wtforms.widgets.HTMLString. WTForms 2.3.0 was released on
   April 21/2020. This release causes shipyard gate fail with
   import error for wtforms.widgets.HTMLString.
2. Deleted psycopg2==2.7.7, which is installed as a dependency of
   apache-airflow extra package postgres, and resoted the newer
   release psycopg2-binary==2.8.4, to be used instead.

Change-Id: I303a2c94ec409e97af1192ae892b8148fcdbb8d5
This commit is contained in:
Ahmad Mahmoudi 2020-04-22 16:50:37 +00:00
parent ec46396487
commit 0091670583
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
images/airflow/Dockerfile.opensuse_15
View File

@ -93,7 +93,9 @@ RUN curl -L -o /usr/local/bin/kubectl \
# https://github.com/puckel/docker-airflow/issues/77
COPY images/airflow/requirements.txt /tmp/
RUN pip3 install -r /tmp/requirements.txt --no-cache-dir \
&& pip3 uninstall -y snakebite || true
&& pip3 uninstall -y snakebite || true \
&& pip3 uninstall -y psycopg2 || true \
&& pip3 install --no-cache-dir --force-reinstall $(pip freeze | grep psycopg2-binary) || true
# Copy scripts used in the container:
COPY images/airflow/script/*.sh ${AIRFLOW_HOME}/

4
images/airflow/Dockerfile.ubuntu_bionic
View File

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

4
images/airflow/Dockerfile.ubuntu_xenial
View File

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

1
images/airflow/requirements.txt
View File

@ -24,6 +24,7 @@ python-openstackclient==3.16.1
kubernetes>=6.0.0
# Need to lock marshmellow-sqlalchemy and tabulate for compatibility issues
marshmallow-sqlalchemy==0.18.0
WTForms~=2.2.1
tabulate==0.8.03
# Dependencies for other UCP components

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

@ -37,6 +37,7 @@ uwsgi==2.0.17
# To support profiling in non-prod
Werkzeug==0.16.1
WTForms~=2.2.1
# Need to lock marshmellow-sqlalchemy and tabulate for compatibility issues
marshmallow-sqlalchemy==0.18.0
tabulate==0.8.03