Removal of multistage features and general cleanup of Dockerfile

This commit is contained in:
Kristóf Tóth 2018-01-18 15:36:45 +01:00
parent ce07c4d6ec
commit 3dbb14ecd3

View File

@ -1,30 +1,12 @@
FROM node:8 as ngbuild
WORKDIR /data/
COPY src/frontend /data/
RUN yarn install --frozen-lockfile
RUN yarn build --no-progress
FROM avatao/ubuntu:16.04 FROM avatao/ubuntu:16.04
ENV TFW_WEB_PORT=4242 RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - &&\
ENV TFW_LOGIN_APP_PORT=6666 curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\
ENV TFW_PUBLIC_PORT=8888 echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list &&\
ENV TFW_SUPERVISOR_HTTP_PORT=9001 apt-get update &&\
EXPOSE ${TFW_PUBLIC_PORT}
ENV TFW_EVENT_HANDLERS_DIR="/opt/event_handlers"
ENV TFW_APP_DIR="/srv/app"
ENV TFW_FRONTEND_DIR="/srv/frontend"
ENV TFW_LOGIN_APP_DIR="/tmp/source_code_server"
ENV TFW_LIB_DIR="/usr/local/lib/"
ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf"
RUN apt-get update && \
apt-get install -qy \ apt-get install -qy \
nodejs \
yarn \
supervisor \ supervisor \
libzmq5 \ libzmq5 \
nginx \ nginx \
@ -36,20 +18,16 @@ RUN apt-get update && \
libreadline-dev \ libreadline-dev \
libsqlite3-dev libsqlite3-dev
COPY src/nginx /etc/nginx WORKDIR /data/
COPY src/frontend /data/
RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx && \ RUN yarn install --frozen-lockfile
# nginx runs as a regular user, and can't write to /run RUN yarn build --no-progress
sed -i 's#pid /run/nginx.pid;#pid /tmp/nginx.pid;#g' /etc/nginx/nginx.conf && \
envsubst "$(printenv | cut -d= -f1 | grep TFW_ | sed -e 's/^/$/g')" \
< /etc/nginx/sites-available/default > /etc/nginx/sites-available/default
USER ${AVATAO_USER} USER ${AVATAO_USER}
WORKDIR /home/${AVATAO_USER} WORKDIR /home/${AVATAO_USER}
COPY .pyenvrc . COPY .pyenvrc .
ARG PYTHON_VERSION="3.6.4"
# no GitHub releases are available, so current tip of head is hardcoded to avoid surprises # no GitHub releases are available, so current tip of head is hardcoded to avoid surprises
ARG PYTHON_VERSION="3.6.4"
ARG PYENV_INSTALLER_URL="https://raw.githubusercontent.com/pyenv/pyenv-installer/78cfd4d/bin/pyenv-installer" ARG PYENV_INSTALLER_URL="https://raw.githubusercontent.com/pyenv/pyenv-installer/78cfd4d/bin/pyenv-installer"
ARG PYENV_INSTALLER_HASH=9509348b828f0564358fff456f7f693dd9ace351dc3f240854d7685ad8a8e1dd ARG PYENV_INSTALLER_HASH=9509348b828f0564358fff456f7f693dd9ace351dc3f240854d7685ad8a8e1dd
RUN curl -fSL -o pyenv-installer ${PYENV_INSTALLER_URL} &&\ RUN curl -fSL -o pyenv-installer ${PYENV_INSTALLER_URL} &&\
@ -62,11 +40,33 @@ RUN curl -fSL -o pyenv-installer ${PYENV_INSTALLER_URL} && \
pyenv global ${PYTHON_VERSION} &&\ pyenv global ${PYTHON_VERSION} &&\
pip install tornado pyzmq transitions pip install tornado pyzmq transitions
ENV TFW_WEB_PORT=4242
ENV TFW_LOGIN_APP_PORT=6666
ENV TFW_PUBLIC_PORT=8888
ENV TFW_SUPERVISOR_HTTP_PORT=9001
ENV TFW_EVENT_HANDLERS_DIR="/opt/event_handlers"
ENV TFW_APP_DIR="/srv/app"
ENV TFW_FRONTEND_DIR="/srv/frontend"
ENV TFW_LOGIN_APP_DIR="/tmp/source_code_server"
ENV TFW_LIB_DIR="/usr/local/lib/"
ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf"
ENV PYTHONPATH=${TFW_LIB_DIR} ENV PYTHONPATH=${TFW_LIB_DIR}
COPY lib $TFW_LIB_DIR
USER root
COPY src/nginx /etc/nginx
RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx && \
# nginx runs as a regular user, and can't write to /run
sed -i 's#pid /run/nginx.pid;#pid /tmp/nginx.pid;#g' /etc/nginx/nginx.conf && \
envsubst "$(printenv | cut -d= -f1 | grep TFW_ | sed -e 's/^/$/g')" \
< /etc/nginx/sites-available/default > /etc/nginx/sites-available/default && \
mv /data/dist ${TFW_FRONTEND_DIR}
USER ${AVATAO_USER}
WORKDIR /home/${AVATAO_USER}
COPY lib ${TFW_LIB_DIR}
COPY supervisord.conf ${TFW_SUPERVISORD_CONF} COPY supervisord.conf ${TFW_SUPERVISORD_CONF}
COPY src/app ${TFW_APP_DIR} COPY src/app ${TFW_APP_DIR}
COPY src/event_handlers ${TFW_EVENT_HANDLERS_DIR} COPY src/event_handlers ${TFW_EVENT_HANDLERS_DIR}
COPY --from=ngbuild /data/dist ${TFW_FRONTEND_DIR} EXPOSE ${TFW_PUBLIC_PORT}
CMD . "$HOME/.pyenvrc" && exec supervisord --nodaemon CMD . "$HOME/.pyenvrc" && exec supervisord --nodaemon