ci: migrate libcc's Dockerfile to electron and update it (electron#14786

) * ci: migrate libcc's Dockerfile to electron and update it * Added nano and sudo * Use new docker image in CircleCi * installing nodejs needs curl * Add needed dependencies nacl contains dependencies needed for arm and ia32 builds
loongson · Sep 25, 2018 · 18c2574 · 18c2574
1 parent c73a690
commit 18c2574
Show file tree

Hide file tree

Showing 5 changed files with 695 additions and 38 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 # Build machines configs.
 docker-image: &docker-image
   docker:
-    - image: electronbuilds/electron:0.0.8
+    - image: electronbuilds/electron:0.0.9
 
 machine-linux-medium: &machine-linux-medium
   <<: *docker-image

diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,4 @@
 *
 !tools/xvfb-init.sh
 !tools/run-electron.sh
+!build/install-build-deps.sh
diff --git a/Dockerfile b/Dockerfile
@@ -1,24 +1,44 @@
-FROM electronbuilds/libchromiumcontent:0.0.4
+FROM ubuntu:18.04
 
-USER root
+RUN groupadd --gid 1000 builduser \
+  && useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
 
-# Set up HOME directory
-ENV HOME=/home
-RUN chmod a+rwx /home
+# Set up TEMP directory
+ENV TEMP=/tmp
+RUN chmod a+rwx /tmp
 
-# Install node.js
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
-RUN apt-get install -y nodejs
+# Install Linux packages
+ADD build/install-build-deps.sh /setup/install-build-deps.sh
+RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    curl \
+    libnotify-bin \
+    locales \
+    lsb-release \
+    nano \
+    python-dbusmock \
+    python-pip \
+    python-setuptools \
+    sudo \
+    vim-nox \
+    wget \
+  && /setup/install-build-deps.sh --syms --no-prompt --no-chromeos-fonts --lib32 --arm \
+  && rm -rf /var/lib/apt/lists/*
 
-# Install wget used by crash reporter
-RUN apt-get install -y wget
+# Install Node.js
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
+  && rm -rf /var/lib/apt/lists/*
 
-# Install python-dbusmock
-RUN apt-get install -y python-dbusmock
+# crcmod is required by gsutil, which is used for filling the gclient git cache
+RUN pip install -U crcmod
 
-# Install libnotify
-RUN apt-get install -y libnotify-bin
+RUN mkdir /tmp/workspace
+RUN chown builduser:builduser /tmp/workspace
 
 # Add xvfb init script
 ADD tools/xvfb-init.sh /etc/init.d/xvfb
 RUN chmod a+x /etc/init.d/xvfb
+
+USER builduser
+WORKDIR /home/builduser
diff --git a/Dockerfile.circleci b/Dockerfile.circleci