Merge

Author: alexf

Dockerfile

@@ -6,6 +6,8 @@ ENV TERM linux
 
 # Airflow
 ARG AIRFLOW_VERSION=1.7.1.3
+ARG AIRFLOW_REPO_URL=https://github.com/apache/incubator-airflow.git
+ARG AIRFLOW_COMMIT=fe037d6
 ENV AIRFLOW_HOME /usr/local/airflow
 
 # Define en_US.
@@ -18,39 +20,45 @@ ENV LC_ALL  en_US.UTF-8
 
 RUN set -ex \
     && buildDeps=' \
-        python-pip \
-        python-dev \
+        python3-dev \
         libkrb5-dev \
         libsasl2-dev \
         libssl-dev \
         libffi-dev \
         build-essential \
         libblas-dev \
         liblapack-dev \
+        libpq-dev \
+        libxml2-dev \
+        libxslt1-dev \
     ' \
-    && echo "deb http://http.debian.net/debian jessie-backports main" >/etc/apt/sources.list.d/backports.list \
     && apt-get update -yqq \
     && apt-get install -yqq --no-install-recommends \
         $buildDeps \
         apt-utils \
         curl \
         netcat \
         locales \
-    && apt-get install -yqq -t jessie-backports python-requests libpq-dev \
     && sed -i 's/^# en_US.UTF-8 UTF-8$/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
     && locale-gen \
     && update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 \
     && useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
+    && pip install --upgrade pip \
     && pip install pytz==2015.7 \
     && pip install cryptography \
     && pip install pyOpenSSL \
     && pip install ndg-httpsclient \
     && pip install pyasn1 \
     && pip install psycopg2 \
-    && pip install google-api-python-client>=1.5.0, <1.6.0 \
-    && pip install oauth2client>=2.0.2, <2.1.0 \
+    && pip install requests \
+    && pip install 'google-api-python-client>=1.5.0,<1.6.0' \
+    && pip install 'oauth2client>=2.0.2,<2.1.0' \
     && pip install httplib2 \
-    && pip install -e git+http://github.com/markovianhq/incubator-airflow.git#egg=airflow \
+    && git clone ${AIRFLOW_REPO_URL} \
+    && cd incubator-airflow \
+    && git checkout ${AIRFLOW_COMMIT} \
+    && pip install -e . \
+    && cd .. \
     && apt-get remove --purge -yqq $buildDeps libpq-dev \
     && apt-get clean \
     && rm -rf \
@@ -62,7 +70,6 @@ RUN set -ex \
         /usr/share/doc-base
 
 COPY script/entrypoint.sh ${AIRFLOW_HOME}/entrypoint.sh
-COPY config/airflow.cfg ${AIRFLOW_HOME}/airflow.cfg
 
 RUN chown -R airflow: ${AIRFLOW_HOME} \
     && chmod +x ${AIRFLOW_HOME}/entrypoint.sh