From 4c50f07be91f66ab0f21a6e7b10f4c2f0ff48ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Wed, 31 Jan 2018 16:15:19 +0100 Subject: [PATCH] Unify Docker container config file locations to project root --- Dockerfile | 4 ++-- {src/nginx => nginx}/sites-available/default | 0 supervisord.conf => supervisor/supervisord.conf | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {src/nginx => nginx}/sites-available/default (100%) rename supervisord.conf => supervisor/supervisord.conf (100%) diff --git a/Dockerfile b/Dockerfile index 943e034..2258331 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ ENV TFW_LIB_DIR="/usr/local/lib/" ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf" ENV PYTHONPATH=${TFW_LIB_DIR} -COPY src/nginx /etc/nginx +COPY 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 && \ @@ -70,7 +70,7 @@ RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx && \ USER ${AVATAO_USER} WORKDIR /home/${AVATAO_USER} COPY lib ${TFW_LIB_DIR} -COPY supervisord.conf ${TFW_SUPERVISORD_CONF} +COPY supervisor/supervisord.conf ${TFW_SUPERVISORD_CONF} COPY src/app ${TFW_APP_DIR} COPY src/event_handlers ${TFW_EVENT_HANDLERS_DIR} diff --git a/src/nginx/sites-available/default b/nginx/sites-available/default similarity index 100% rename from src/nginx/sites-available/default rename to nginx/sites-available/default diff --git a/supervisord.conf b/supervisor/supervisord.conf similarity index 100% rename from supervisord.conf rename to supervisor/supervisord.conf