From 16de5be6735090999ff9dc5b16a9468b0a4d0a36 Mon Sep 17 00:00:00 2001
From: Joakim Fors <joakim.fors@trivector.se>
Date: Thu, 18 Jun 2020 14:23:59 +0200
Subject: [PATCH] Use simplified entrypoint script

---
 .dockerignore        |  2 +-
 Dockerfile           |  8 +++++---
 docker-entrypoint.sh | 11 +++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100755 docker-entrypoint.sh

diff --git a/.dockerignore b/.dockerignore
index 2523191..b849c8a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,4 @@
 !public
 !package.json
 !package-lock.json
-!run.sh
+!docker-entrypoint.sh
diff --git a/Dockerfile b/Dockerfile
index f51c688..b624db3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,12 +40,12 @@ RUN export DEBIAN_FRONTEND=noninteractive \
       libprotobuf17 \
       libxxf86vm1 \
       xvfb \
-      x11-utils \
+      xauth \
   && apt-get -y --purge autoremove \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-COPY --from=builder /usr/src/app /usr/src/app
+COPY --from=builder /usr/src/app /app
 
 ENV NODE_ENV="production"
 ENV CHOKIDAR_USEPOLLING=1
@@ -56,4 +56,6 @@ WORKDIR /data
 
 EXPOSE 80
 
-ENTRYPOINT ["/usr/src/app/run.sh"]
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
+
+CMD ["-p", "80"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100755
index 0000000..599800e
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if ! which -- "${1}"; then
+  # first arg is not an executable
+  xvfb-run --server-args="-screen 0 1024x768x24" -- node /app/ "$@"
+  exit $?
+fi
+
+exec "$@"