diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..72e8ffc0db
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+*
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..e11d312bba
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,8 @@
+FROM libchromiumcontent-linux:latest
+
+# Install node.js
+RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
+RUN apt-get update && apt-get install -y --force-yes nodejs
+
+# Install wget used by crash reporter
+RUN apt-get install -y --force-yes  wget
diff --git a/script/cibuild-linux b/script/cibuild-linux
index 7e390bca58..f1625a537c 100755
--- a/script/cibuild-linux
+++ b/script/cibuild-linux
@@ -26,6 +26,11 @@ docker build \
   --tag libchromiumcontent-linux \
   ./vendor/libchromiumcontent
 
+docker build \
+  --force-rm \
+  --tag electron-linux \
+  .
+
 docker run \
   --rm \
   --env TARGET_ARCH="$TARGET_ARCH" \
@@ -41,4 +46,4 @@ docker run \
   --volume /dev/shm:/dev/shm \
   --workdir /workspace/electron \
   --privileged \
-  libchromiumcontent-linux script/cibuild
+  electron-linux script/cibuild