From f79a90161ccac0067e6faf2917d78c2f09d2aac2 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 21 Jul 2017 13:42:00 -0700 Subject: [PATCH] Extend libcc Dockerfile for Electron Linux build --- .dockerignore | 1 + Dockerfile | 8 ++++++++ script/cibuild-linux | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000000..72e8ffc0db8a --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +* diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000000..e11d312bba61 --- /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 7e390bca58b7..f1625a537caa 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