From b2e257bf378c62ab6691dd8338cbadb9be8f9595 Mon Sep 17 00:00:00 2001
From: Antonis Kalipetis <akalipetis@gmail.com>
Date: Thu, 15 Dec 2016 18:26:24 +0200
Subject: [PATCH] Remove entrypoint

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
---
 Dockerfile    | 5 ++---
 entrypoint.sh | 8 --------
 2 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100755 entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index ffbcd379..fa1a9209 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get update \
 WORKDIR /usr/src/app
 
 # Set an entrypoint, to automatically install node modules
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/bin/bash", "-c", "if [[ ! -d node_modules ]]; then npm install; fi; exec \"$@\";"]
+CMD ["npm", "run", "dev"]
 
 # First, install dependencies to improve layer caching
 COPY package.json /usr/src/app/
@@ -22,4 +22,3 @@ COPY . /usr/src/app
 
 # Run the tests and build, to make sure everything is working nicely
 RUN npm run test && npm run build
-CMD ["npm", "run", "dev"]
diff --git a/entrypoint.sh b/entrypoint.sh
deleted file mode 100755
index 4c63d001..00000000
--- a/entrypoint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/bash
-
-# Install Node modules, if the `node_modules` directory does not exist
-if [[ ! -d node_modules ]]; then
-  npm install;
-fi
-
-exec "$@"