airship/shipyard
Code Issues Proposed changes

Upgrade apache-airflow to 1.10.5

Browse Source 
Upgraded apache-airflow to 1.10.5 to address the database migration issue
https://issues.apache.org/jira/browse/AIRFLOW-6046.

Change-Id: Ib8678cddb2deb4f5ef944d026e0d2633a326d9cc
This commit is contained in:
Ahmad Mahmoudi 2020-03-29 21:40:41 +00:00
parent 29824c78b4
commit df751e302c
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -93,7 +93,7 @@ endif
.PHONY: build
build:
ifeq ($(USE_PROXY), true)
docker build --network host -t $(IMAGE) --label $(LABEL) \
docker build --force-rm --network host -t $(IMAGE) --label $(LABEL) \
--label "org.opencontainers.image.revision=$(COMMIT)" \
--label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \
--label "org.opencontainers.image.title=$(IMAGE_NAME)" \
@ -109,7 +109,7 @@ ifeq ($(USE_PROXY), true)
--build-arg NO_PROXY=$(NO_PROXY) \
--build-arg ctx_base=$(BUILD_CTX) .
else
docker build --network host -t $(IMAGE) --label $(LABEL) \
docker build --force-rm --network host -t $(IMAGE) --label $(LABEL) \
--label "org.opencontainers.image.revision=$(COMMIT)" \
--label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \
--label "org.opencontainers.image.title=$(IMAGE_NAME)" \

2
images/airflow/Dockerfile.opensuse_15
View File

@ -40,7 +40,7 @@ EXPOSE $WORKER_PORT
# Set ARG for usage during build
ARG AIRFLOW_HOME=/usr/local/airflow
ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.4"
ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.5"
ARG ctx_base=src/bin
# Kubectl version

2
images/airflow/Dockerfile.ubuntu_bionic
View File

@ -40,7 +40,7 @@ EXPOSE $WORKER_PORT
# Set ARG for usage during build
ARG AIRFLOW_HOME=/usr/local/airflow
ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.4"
ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.5"
ARG DEBIAN_FRONTEND=noninteractive
ARG ctx_base=src/bin

2
images/airflow/Dockerfile.ubuntu_xenial
View File

@ -40,7 +40,7 @@ EXPOSE $WORKER_PORT
# Set ARG for usage during build
ARG AIRFLOW_HOME=/usr/local/airflow
ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.4"
ARG AIRFLOW_SRC="apache-airflow[crypto,celery,postgres,hive,hdfs,jdbc]==1.10.5"
ARG DEBIAN_FRONTEND=noninteractive
ARG ctx_base=src/bin

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

@ -31,7 +31,7 @@ python-dateutil==2.7.3
python-memcached==1.59
requests==2.20.0
setuptools==40.4.1
SQLAlchemy==1.2.12
SQLAlchemy==1.3.15
ulid==1.1
uwsgi==2.0.17

10
tools/airflow_image_run.sh
View File

@ -19,6 +19,16 @@ IMAGE=$1
USE_PROXY=${USE_PROXY:-false}
NO_PROXY=${NO_PROXY:-}
# clearn up airflow_test leftover from a privous run
if [ -n "$(docker ps -aq -f name=airflow_test -f status=running)" ]; then
docker stop airflow_test
sleep 5
fi
if [ -n "$(docker ps -aq -f name=airflow_test)" ]; then
docker rm -f airflow_test
sleep 5
fi
if [ "${USE_PROXY}" == "true" ]; then
TEST_RESP="$(docker run \
-p 8080:8080 \