build: use autogenerated docker images for CI runs (#21056)
* build: use autogenerated docker images for CI runs * build: depend on exact tag instead of rolling :latest * chore: use newer docker image
This commit is contained in:
parent
3c75adb236
commit
8320160fe2
7 changed files with 3 additions and 180 deletions
|
@ -53,7 +53,7 @@ parameters:
|
||||||
# Build machines configs.
|
# Build machines configs.
|
||||||
docker-image: &docker-image
|
docker-image: &docker-image
|
||||||
docker:
|
docker:
|
||||||
- image: electronbuilds/electron:0.0.10
|
- image: electronjs/build:697b894f36d127155e020f4e8ad4b2e5f6a09613
|
||||||
|
|
||||||
machine-linux-medium: &machine-linux-medium
|
machine-linux-medium: &machine-linux-medium
|
||||||
<<: *docker-image
|
<<: *docker-image
|
||||||
|
|
50
Dockerfile
50
Dockerfile
|
@ -1,50 +0,0 @@
|
||||||
FROM ubuntu:18.04
|
|
||||||
|
|
||||||
RUN groupadd --gid 1000 builduser \
|
|
||||||
&& useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
|
|
||||||
|
|
||||||
# Set up TEMP directory
|
|
||||||
ENV TEMP=/tmp
|
|
||||||
RUN chmod a+rwx /tmp
|
|
||||||
|
|
||||||
# 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 dpkg --add-architecture i386
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
|
||||||
curl \
|
|
||||||
libnotify-bin \
|
|
||||||
locales \
|
|
||||||
lsb-release \
|
|
||||||
nano \
|
|
||||||
python-dbus \
|
|
||||||
python-pip \
|
|
||||||
python-setuptools \
|
|
||||||
sudo \
|
|
||||||
vim-nox \
|
|
||||||
wget \
|
|
||||||
g++-multilib \
|
|
||||||
libgl1:i386 \
|
|
||||||
&& /setup/install-build-deps.sh --syms --no-prompt --no-chromeos-fonts --lib32 --arm \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# 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/*
|
|
||||||
|
|
||||||
# crcmod is required by gsutil, which is used for filling the gclient git cache
|
|
||||||
RUN pip install -U crcmod
|
|
||||||
|
|
||||||
# dbusmock is needed for Electron tests
|
|
||||||
RUN pip install python-dbusmock
|
|
||||||
|
|
||||||
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
|
|
|
@ -1,59 +0,0 @@
|
||||||
FROM arm32v7/ubuntu:18.04
|
|
||||||
|
|
||||||
RUN groupadd --gid 1000 builduser \
|
|
||||||
&& useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
|
|
||||||
|
|
||||||
# Set up TEMP directory
|
|
||||||
ENV TEMP=/tmp
|
|
||||||
RUN chmod a+rwx /tmp
|
|
||||||
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
|
||||||
bison \
|
|
||||||
build-essential \
|
|
||||||
clang \
|
|
||||||
curl \
|
|
||||||
gperf \
|
|
||||||
git \
|
|
||||||
libasound2 \
|
|
||||||
libasound2-dev \
|
|
||||||
libcap-dev \
|
|
||||||
libcups2-dev \
|
|
||||||
libdbus-1-dev \
|
|
||||||
libgnome-keyring-dev \
|
|
||||||
libgtk2.0-0 \
|
|
||||||
libgtk2.0-dev \
|
|
||||||
libgtk-3-0 \
|
|
||||||
libgtk-3-dev \
|
|
||||||
libnotify-bin \
|
|
||||||
libnss3 \
|
|
||||||
libnss3-dev \
|
|
||||||
libxss1 \
|
|
||||||
libxtst-dev \
|
|
||||||
libxtst6 \
|
|
||||||
lsb-release \
|
|
||||||
locales \
|
|
||||||
nano \
|
|
||||||
python-setuptools \
|
|
||||||
python-pip \
|
|
||||||
python-dbusmock \
|
|
||||||
sudo \
|
|
||||||
unzip \
|
|
||||||
wget \
|
|
||||||
xvfb \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Install Node.js
|
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_13.x | bash - \
|
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# crcmod is required by gsutil, which is used for filling the gclient git cache
|
|
||||||
RUN pip install -U crcmod
|
|
||||||
|
|
||||||
ADD tools/xvfb-init.sh /etc/init.d/xvfb
|
|
||||||
RUN chmod a+x /etc/init.d/xvfb
|
|
||||||
|
|
||||||
RUN usermod -aG sudo builduser
|
|
||||||
RUN echo 'builduser ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers
|
|
||||||
|
|
||||||
WORKDIR /home/builduser
|
|
|
@ -1,65 +0,0 @@
|
||||||
FROM arm64v8/ubuntu:18.04
|
|
||||||
|
|
||||||
RUN groupadd --gid 1000 builduser \
|
|
||||||
&& useradd --uid 1000 --gid builduser --shell /bin/bash --create-home builduser
|
|
||||||
|
|
||||||
# Set up TEMP directory
|
|
||||||
ENV TEMP=/tmp
|
|
||||||
RUN chmod a+rwx /tmp
|
|
||||||
|
|
||||||
RUN dpkg --add-architecture armhf
|
|
||||||
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
|
||||||
bison \
|
|
||||||
build-essential \
|
|
||||||
clang \
|
|
||||||
curl \
|
|
||||||
gperf \
|
|
||||||
git \
|
|
||||||
libasound2 \
|
|
||||||
libasound2-dev \
|
|
||||||
libc6:armhf \
|
|
||||||
libcap-dev \
|
|
||||||
libcups2-dev \
|
|
||||||
libdbus-1-dev \
|
|
||||||
libgnome-keyring-dev \
|
|
||||||
libgtk2.0-0 \
|
|
||||||
libgtk2.0-dev \
|
|
||||||
libgtk-3-0 \
|
|
||||||
libgtk-3-dev \
|
|
||||||
libnotify-bin \
|
|
||||||
libnss3 \
|
|
||||||
libnss3-dev \
|
|
||||||
libstdc++6:armhf \
|
|
||||||
libxss1 \
|
|
||||||
libxtst-dev \
|
|
||||||
libxtst6 \
|
|
||||||
lsb-release \
|
|
||||||
locales \
|
|
||||||
nano \
|
|
||||||
python-setuptools \
|
|
||||||
python-pip \
|
|
||||||
sudo \
|
|
||||||
unzip \
|
|
||||||
wget \
|
|
||||||
xvfb \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# 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/*
|
|
||||||
|
|
||||||
# crcmod is required by gsutil, which is used for filling the gclient git cache
|
|
||||||
RUN pip install -U crcmod
|
|
||||||
|
|
||||||
# dbusmock is needed for Electron tests
|
|
||||||
RUN pip install python-dbusmock
|
|
||||||
|
|
||||||
ADD tools/xvfb-init.sh /etc/init.d/xvfb
|
|
||||||
RUN chmod a+x /etc/init.d/xvfb
|
|
||||||
|
|
||||||
RUN usermod -aG sudo builduser
|
|
||||||
RUN echo 'builduser ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers
|
|
||||||
|
|
||||||
WORKDIR /home/builduser
|
|
|
@ -1,3 +0,0 @@
|
||||||
XVFB=/usr/bin/Xvfb
|
|
||||||
XVFBARGS="$DISPLAY -ac -screen 0 1024x768x16 +extension RANDR"
|
|
||||||
/sbin/start-stop-daemon --start --quiet --background --exec $XVFB -- $XVFBARGS
|
|
|
@ -1,7 +1,7 @@
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: arm32v7-test-container
|
- container: arm32v7-test-container
|
||||||
image: electronbuilds/arm32v7:0.0.3
|
image: electronjs/build:arm32v7-697b894f36d127155e020f4e8ad4b2e5f6a09613
|
||||||
options: --shm-size 128m
|
options: --shm-size 128m
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: arm64v8-test-container
|
- container: arm64v8-test-container
|
||||||
image: electronbuilds/arm64v8:0.0.5
|
image: electronjs/build:arm64v8-697b894f36d127155e020f4e8ad4b2e5f6a09613
|
||||||
options: --shm-size 128m
|
options: --shm-size 128m
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
Loading…
Reference in a new issue