From 006c6f137c8b17ba58b6e3f8d49177bfb1ba5a99 Mon Sep 17 00:00:00 2001
From: Erkka Makinen <erkka.makinen@reaktor.com>
Date: Tue, 14 Aug 2018 08:04:52 +0300
Subject: [PATCH] Move PATH and NODE_ENV under Dockerfile. Fixes problem with
 PATH in modified shell environment.

---
 Dockerfile         | 4 +++-
 docker-compose.yml | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6d7ee9023..bbb229434 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM node:8.11
 
+ENV PATH /opt/outline/node_modules/.bin:/opt/node_modules/.bin:$PATH
+ENV NODE_PATH /opt/outline/node_modules:/opt/node_modules
 ENV APP_PATH /opt/outline
 RUN mkdir -p $APP_PATH
 
@@ -8,4 +10,4 @@ COPY . $APP_PATH
 RUN yarn
 RUN cp -r /opt/outline/node_modules /opt/node_modules
 
-CMD yarn build && yarn start
\ No newline at end of file
+CMD yarn build && yarn start
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e4b8910d..24259efa2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,6 +34,3 @@ services:
       - postgres
       - redis
       - s3
-    environment:
-      NODE_PATH: "/opt/outline/node_modules:/opt/node_modules"
-      PATH: "/opt/outline/node_modules/.bin:/opt/node_modules/.bin:$PATH"