diff --git a/.gitignore b/.gitignore index 9c0f4ca4..fa1e64cc 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ Session.vim # sftp configuration file sftp-config.json +*.pyc diff --git a/Dockerfile b/Dockerfile index 24920d5e..6c96c8b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# VERSION 1.8.1-1 +# VERSION 1.9.0-1 # AUTHOR: Matthieu "Puckel_" Roisil # DESCRIPTION: Basic Airflow container # BUILD: docker build --rm -t puckel/docker-airflow . @@ -12,7 +12,7 @@ ENV DEBIAN_FRONTEND noninteractive ENV TERM linux # Airflow -ARG AIRFLOW_VERSION=1.8.2 +ARG AIRFLOW_VERSION=1.9.0 ARG AIRFLOW_HOME=/usr/local/airflow # Define en_US. @@ -57,7 +57,7 @@ RUN set -ex \ && pip install ndg-httpsclient \ && pip install pyasn1 \ && pip install apache-airflow[crypto,celery,postgres,hive,jdbc]==$AIRFLOW_VERSION \ - && pip install celery[redis]==3.1.17 \ + && pip install celery[redis] \ && apt-get purge --auto-remove -yqq $buildDeps \ && apt-get clean \ && rm -rf \ diff --git a/circle.yml b/circle.yml index 5981fe23..cd93ab2f 100644 --- a/circle.yml +++ b/circle.yml @@ -12,4 +12,4 @@ test: pre: - sleep 5 override: - - docker run puckel/docker-airflow version |grep '1.8.2' + - docker run puckel/docker-airflow version |grep '1.9.0' diff --git a/docker-compose-CeleryExecutor.yml b/docker-compose-CeleryExecutor.yml index 95025601..303fae25 100644 --- a/docker-compose-CeleryExecutor.yml +++ b/docker-compose-CeleryExecutor.yml @@ -16,7 +16,7 @@ services: # - ./pgdata:/var/lib/postgresql/data/pgdata webserver: - image: puckel/docker-airflow:1.8.2 + image: puckel/docker-airflow:1.9.0 restart: always depends_on: - postgres @@ -41,7 +41,7 @@ services: retries: 3 flower: - image: puckel/docker-airflow:1.8.2 + image: puckel/docker-airflow:1.9.0 restart: always depends_on: - redis @@ -53,7 +53,7 @@ services: command: flower scheduler: - image: puckel/docker-airflow:1.8.2 + image: puckel/docker-airflow:1.9.0 restart: always depends_on: - webserver @@ -70,7 +70,7 @@ services: command: scheduler worker: - image: puckel/docker-airflow:1.8.2 + image: puckel/docker-airflow:1.9.0 restart: always depends_on: - scheduler diff --git a/docker-compose-LocalExecutor.yml b/docker-compose-LocalExecutor.yml index d05c06dd..fbad6319 100644 --- a/docker-compose-LocalExecutor.yml +++ b/docker-compose-LocalExecutor.yml @@ -8,7 +8,7 @@ services: - POSTGRES_DB=airflow webserver: - image: puckel/docker-airflow:1.8.2 + image: puckel/docker-airflow:1.9.0 restart: always depends_on: - postgres