From aa0fe5d00fdada9e0554b700f2f3e2f7627b572d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= <kristof.toth@avatao.com>
Date: Wed, 1 Aug 2018 14:17:02 +0200
Subject: [PATCH] Improve Dockerfile

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a264278..5a66fd1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,9 +35,9 @@ ENV PYTHONPATH="/usr/local/lib"                                            \
     TFW_NGINX_DEFAULT="/etc/nginx/sites-enabled/default"                   \
     TFW_NGINX_COMPONENTS="/etc/nginx/components"                           \
     TFW_LIB_DIR="/usr/local/lib"                                           \
-    TFW_TERMINADO_DIR="/tmp/terminado_server"                              \
     TFW_FRONTEND_DIR="/srv/frontend"                                       \
-    TFW_SERVER_DIR="/srv/.tfw"                                             \
+    TFW_DIR="/.tfw"                                                        \
+    TFW_SERVER_DIR="/.tfw/tfw_server"                                      \
     TFW_AUTH_KEY="/tmp/tfw-auth.key"                                       \
     TFW_HISTFILE="/home/${AVATAO_USER}/.bash_history"                      \
     PROMPT_COMMAND="history -a"
@@ -74,4 +74,4 @@ ONBUILD RUN test -z "${NOFRONTEND}" && cd /data && yarn install --frozen-lockfil
 ONBUILD RUN test -z "${NOFRONTEND}" && cd /data && yarn build --no-progress || :
 ONBUILD RUN test -z "${NOFRONTEND}" && mv /data/dist ${TFW_FRONTEND_DIR} && rm -rf /data || :
 
-CMD exec supervisord --nodaemon
+CMD exec supervisord --nodaemon --configuration ${TFW_SUPERVISORD_CONF}