Skip to content

Commit

Permalink
ci: migrate libcc's Dockerfile to electron and update it
Browse files Browse the repository at this point in the history
  • Loading branch information
nornagon committed Sep 24, 2018
1 parent e9549a8 commit d7c170f
Show file tree
Hide file tree
Showing 4 changed files with 687 additions and 37 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*
!tools/xvfb-init.sh
!tools/run-electron.sh
!build/install-build-deps.sh
41 changes: 27 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,37 @@
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
# Install Linux packages
ADD build/install-build-deps.sh /setup/install-build-deps.sh
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
RUN apt-get install -y nodejs
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 \
libnotify-bin \
locales \
lsb-release \
nodejs \
python-dbusmock \
python-pip \
python-setuptools \
vim-nox \
wget \
&& /setup/install-build-deps.sh --syms --no-prompt --no-chromeos-fonts --no-nacl \
&& rm -rf /var/lib/apt/lists/*

# Install wget used by crash reporter
RUN apt-get install -y wget
RUN pip install -U crcmod

# Install python-dbusmock
RUN apt-get install -y python-dbusmock

# 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
23 changes: 0 additions & 23 deletions Dockerfile.circleci

This file was deleted.

Loading

0 comments on commit d7c170f

Please sign in to comment.