Skip to content

Commit

Permalink
Merge pull request #14 from puckel/1.6.2
Browse files Browse the repository at this point in the history
v1.6.2
  • Loading branch information
puckel committed Jan 7, 2016
2 parents 6ea438e + cdd3b52 commit 494ee2a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# VERSION 1.1
# VERSION 1.6.2
# AUTHOR: Matthieu "Puckel_" Roisil
# DESCRIPTION: Basic Airflow container
# BUILD: docker build --rm -t puckel/docker-airflow
Expand All @@ -12,7 +12,7 @@ ENV DEBIAN_FRONTEND noninteractive
ENV TERM linux
# Work around initramfs-tools running on kernel 'upgrade': <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594189>
ENV INITRD No
ENV AIRFLOW_VERSION 1.6.1
ENV AIRFLOW_VERSION 1.6.2
ENV AIRFLOW_HOME /usr/local/airflow
ENV PYTHONLIBPATH /usr/lib/python2.7/dist-packages

Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ test:
pre:
- sleep 5
override:
- docker run puckel/docker-airflow version |grep '1.6.1'
- docker run puckel/docker-airflow version |grep '1.6.2'
2 changes: 1 addition & 1 deletion config/airflow.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ smtp_starttls = True
smtp_user = airflow
smtp_port = 25
smtp_password = airflow
smtp_mail_from = airflow@airflow.com
smtp_mail_from = airflow@airflow.local

[celery]
# This section only applies if you are using the CeleryExecutor in
Expand Down

0 comments on commit 494ee2a

Please sign in to comment.