From 984940171dbed065c6e2132fd532a13501b377fb Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Mon, 6 Aug 2018 19:49:47 +0300
Subject: [PATCH] Remove bad instructions from docker-compose

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

diff --git a/Dockerfile b/Dockerfile
index 69171c1..f434428 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM node:8
-WORKDIR /code
 COPY package*.json ./
+ENV IS_DOCKER 1
+RUN env
 RUN npm install
 COPY . .
 EXPOSE 8080
-CMD ["npm", "start"]
diff --git a/docker-compose-frontend.yml b/docker-compose-frontend.yml
index 107a103..8fc06bf 100644
--- a/docker-compose-frontend.yml
+++ b/docker-compose-frontend.yml
@@ -4,6 +4,6 @@ services:
   web-frontend:
     build: .
     image: git.sahkoinsinoorikilta.fi:4567/vtmk/web2.0-frontend
-    command: ["bash", "-c", "cd /code && ./wait-for-it.sh db:5432 -- npm run start-prod"]
+    command: ["bash", "-c", "npm run start-prod"]
     ports:
       - "3000:8080"