From 58cf4d5a435c27c8895eefa2258e0b14de92e7cc Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Wed, 20 May 2020 13:37:14 -0400
Subject: [PATCH 1/2] use chromium's headless mode

---
 src/util/init-app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util/init-app.js b/src/util/init-app.js
index 879ded58..fa3f9385 100644
--- a/src/util/init-app.js
+++ b/src/util/init-app.js
@@ -8,6 +8,7 @@
  */
 function initApp (app, ipcMain) {
   app.commandLine.appendSwitch('ignore-gpu-blacklist')
+  app.commandLine.appendSwitch('headless')
 
   ipcMain.on('renderer-error', (event, info) => {
     app.emit('renderer-error', {

From c5c8c0954d21f784acd745ed91c65aaf6aa1d2e5 Mon Sep 17 00:00:00 2001
From: Antoine Roy-Gobeil <antoine@plot.ly>
Date: Wed, 20 May 2020 13:40:10 -0400
Subject: [PATCH 2/2] :hocho: xvfb from Docker image

---
 deployment/Dockerfile    | 2 +-
 deployment/entrypoint.sh | 2 +-
 deployment/run_server    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployment/Dockerfile b/deployment/Dockerfile
index 5e220a5f..c6c87a12 100644
--- a/deployment/Dockerfile
+++ b/deployment/Dockerfile
@@ -114,7 +114,7 @@ COPY deployment/ImageMagickPolicy.xml /etc/ImageMagick-6/policy.xml
 ####################
 # Copy and set up Orca
 
-RUN apt-get update && apt-get install -y chromium-browser fonts-liberation xvfb poppler-utils git \
+RUN apt-get update && apt-get install -y chromium-browser fonts-liberation poppler-utils git \
     && rm -rf /var/lib/apt/lists/* && apt-get clean
 
 COPY package.json /var/www/image-exporter/
diff --git a/deployment/entrypoint.sh b/deployment/entrypoint.sh
index 3b68741d..b9f7bbcd 100755
--- a/deployment/entrypoint.sh
+++ b/deployment/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [[ $1 == "--help" || $1 == "--version" || $1 == "graph" ]]; then
-    xvfb-run --server-args "-screen 0 640x480x24" -a /var/www/image-exporter/bin/orca.js "$@"
+    /var/www/image-exporter/bin/orca.js "$@"
 elif [[ $1 == "serve" ]]; then
     shift 1 # Remove argument "serve" since it is assumed in the following
     /run_server "$@"
diff --git a/deployment/run_server b/deployment/run_server
index 12688257..1b735fd5 100755
--- a/deployment/run_server
+++ b/deployment/run_server
@@ -40,7 +40,7 @@ pkill -9 Xvfb
 pkill -9 node
 pkill -9 electron
 
-xvfb-run --auto-servernum --server-args '-screen 0 1024x768x24' /var/www/image-exporter/bin/orca.js serve $REQUEST_LIMIT --safe-mode --verbose $PLOTLYJS_ARG $ORCA_IGNORECERTERRORS_ARG $@ &
+/var/www/image-exporter/bin/orca.js serve $REQUEST_LIMIT --safe-mode --verbose $PLOTLYJS_ARG $ORCA_IGNORECERTERRORS_ARG $@ &
 echo \$! > \$PIDFILE
 
 EOF