Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Sep 25, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7c170f
ci: migrate libcc's Dockerfile to electron and update it
nornagon Sep 24, 2018
b2c4764
Added nano and sudo
Sep 24, 2018
66e9c61
Use new docker image in CircleCi
Sep 24, 2018
ad6bc26
installing nodejs needs curl
nornagon Sep 24, 2018
0e772f5
Add needed dependencies
Sep 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
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
48 changes: 34 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
23 changes: 0 additions & 23 deletions Dockerfile.circleci
View file
Open in desktop

This file was deleted.

Loading