Merge branch 'development' of https://github.com/malmike/BucketlistApp …

…into development
malmike · Oct 2, 2017 · 2f99150 · 2f99150
2 parents 47cdd18 + 029a3bc
commit 2f99150
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: malmike/bucketlistapp:bucketlistapp
+      - image: circleci/node:[latest-browsers]
         env:
           - DISPLAY=:99
           - CHROME_BIN=/usr/bin/google-chrome

diff --git a/Dockerfile b/Dockerfile
@@ -17,4 +17,7 @@ RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable
 RUN apt-get update
 RUN apt-get install -y google-chrome-stable
 
+# Install Xvfb
+RUN apt-get install -y xvfb
+
 CMD ['echo', 'Done!']