From d19367391767db1dd20c06d2217b5836980fbbf2 Mon Sep 17 00:00:00 2001
From: Pranas Ziaukas <pranas.ziaukas@gmail.com>
Date: Wed, 15 Apr 2020 19:07:01 +0300
Subject: [PATCH] Use CMD alongside ENTRYPOINT in the Dockerfile (#3366)

This allows for runtime customization, see #3362.
---
 docker/Dockerfile | 1 +
 docker/run.sh     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 48d199c22..8762fc6b8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,3 +28,4 @@ ARG COMMIT
 RUN echo "{\"hash\": \"$COMMIT\"}" > .hash.json
 
 ENTRYPOINT ["./run.sh"]
+CMD ["npm", "start"]
diff --git a/docker/run.sh b/docker/run.sh
index d628827e3..7b3467738 100644
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -13,4 +13,4 @@ if [ ! -f "$DATA/configuration.yaml" ]; then
     cp /app/configuration.yaml "$DATA/configuration.yaml"
 fi
 
-exec npm start
+exec "$@"