From 6282a1150cde085e95c92ce78fbdccd4d3645e83 Mon Sep 17 00:00:00 2001
From: Mark Lee <electronjs@lazymalevolence.com>
Date: Thu, 7 Dec 2017 18:38:58 -0800
Subject: [PATCH] chore(tests): remove intermediate layer when running via
 Docker

---
 ci/Dockerfile | 7 -------
 ci/docker.sh  | 5 ++++-
 ci/script.sh  | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 ci/Dockerfile

diff --git a/ci/Dockerfile b/ci/Dockerfile
deleted file mode 100644
index 4235bd68e5..0000000000
--- a/ci/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM malept/electron-forge-container:latest
-
-ENV CI=true
-
-RUN mkdir /code
-WORKDIR /code
-ADD . /code/
diff --git a/ci/docker.sh b/ci/docker.sh
index 42f5be3712..7b6673685d 100755
--- a/ci/docker.sh
+++ b/ci/docker.sh
@@ -3,4 +3,7 @@
 NODE_INSTALLER="$1"
 
 if [[ "$NODE_INSTALLER" = "yarn" ]]; then npm i -g yarn; fi
-npm run test -- --installer=$NODE_INSTALLER
+
+cd /code
+
+CI=true npm run test -- --installer=$NODE_INSTALLER
diff --git a/ci/script.sh b/ci/script.sh
index 010d375c28..902e39383b 100755
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
-    sudo docker build -f ci/Dockerfile . -t electron-forge-ci
-    sudo docker run -it electron-forge-ci ci/docker.sh $NODE_INSTALLER
+    sudo docker run --interactive --tty --volume $(pwd):/code malept/electron-forge-container:latest /code/ci/docker.sh $NODE_INSTALLER
 else
     npm run test-coverage -- --installer=$NODE_INSTALLER
 fi