Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AIRFLOW-3906] Add npm compile to docker file #4724

Merged
merged 8 commits into from
Feb 28, 2019
Merged

[AIRFLOW-3906] Add npm compile to docker file #4724

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
694670a
Added compile step for npm packages
ffinfo Feb 17, 2019
00fdc19
Remove duplicated library
ffinfo Feb 17, 2019
d0dcaec
Merge remote-tracking branch 'origin/master' into add_npm_docker
ffinfo Feb 20, 2019
a6b8184
Move check outside if statement
ffinfo Feb 21, 2019
ce75dd2
Merge remote-tracking branch 'origin/master' into add_npm_docker
ffinfo Feb 24, 2019
fc836b1
Fixing some small comments
ffinfo Feb 24, 2019
4c55f58
Rename buildDeps
ffinfo Feb 25, 2019
02d1dea
Merge remote-tracking branch 'origin/master' into add_npm_docker
ffinfo Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,37 @@

FROM python:3.6-slim

COPY . /opt/airflow/

ARG AIRFLOW_HOME=/usr/local/airflow
ENV AIRFLOW_HOME=/usr/local/airflow
ARG AIRFLOW_DEPS="all"
ARG PYTHON_DEPS=""
ARG buildDeps="freetds-dev libkrb5-dev libsasl2-dev libssl-dev libffi-dev libpq-dev git"
ARG APT_DEPS="$buildDeps libsasl2-dev freetds-bin build-essential default-libmysqlclient-dev apt-utils curl rsync netcat locales"
ARG BUILD_DEPS="freetds-dev libkrb5-dev libssl-dev libffi-dev libpq-dev git"
ARG APT_DEPS="libsasl2-dev freetds-bin build-essential default-libmysqlclient-dev apt-utils curl rsync netcat locales"
ffinfo marked this conversation as resolved.
Show resolved Hide resolved

WORKDIR /opt/airflow
RUN set -x \
ENV PATH="$HOME/.npm-packages/bin:$PATH"

RUN set -euxo pipefail \
&& apt update \
&& if [ -n "${APT_DEPS}" ]; then apt install -y $APT_DEPS; fi \
&& curl -sL https://deb.nodesource.com/setup_10.x | bash - \
&& apt update \
&& apt install -y nodejs \
&& apt autoremove -yqq --purge \
&& apt clean

COPY . /opt/airflow/

WORKDIR /opt/airflow/airflow/www
RUN npm install \
&& npm run prod
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-1 to doing it this way: Having Node and all of the node_modules in the final image isn't great.

Instead we should use a multi-stage docker file so this line becomes:

COPY --from=assert-builder /opt/airflow/airflow/www/static/dist /opt/airflow/airflow/www/static/dist

And then earlier in the docker file we have (i.e. right at the start)

FROM node as asset-builder
COPY ./airflow/www/package*json /opt/airflow/airflow/www/package.json
RUN npm install
COPY ./airflow/www/static/ /opt/airflow/airflow/www/static/
RUN npm run prod

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as @jmcarp said in #4724 (comment)


WORKDIR /opt/airflow
RUN set -euxo pipefail \
&& apt update \
&& if [ -n "${BUILD_DEPS}" ]; then apt install -y $BUILD_DEPS; fi \
&& if [ -n "${PYTHON_DEPS}" ]; then pip install --no-cache-dir ${PYTHON_DEPS}; fi \
&& pip install --no-cache-dir --upgrade pip==19.0.1 \
&& pip install --no-cache-dir --no-use-pep517 -e .[$AIRFLOW_DEPS] \
&& apt purge --auto-remove -yqq $buildDeps \
&& apt purge --auto-remove -yqq $BUILD_DEPS \
&& apt autoremove -yqq --purge \
&& apt clean

Expand Down