* Bump electronbuilds/electron* versions

The linux-appname branch has been gathering dust for awhile.
Some of the versions in `master` are higher, and some of the
versions in `linux-appname` are higher to add libnotify.

This commit takes the higher of the two numbers in each case.

* Add libnotify to the Dockerfiles
This commit is contained in:
Charles Kerr 2018-03-09 12:07:50 +09:00 коммит произвёл Shelley Vohr
Родитель 15503a3b9e
Коммит 5f48f91d94
5 изменённых файлов: 14 добавлений и 6 удалений

Просмотреть файл

@ -3,7 +3,7 @@ version: 2
jobs: jobs:
electron-linux-arm: electron-linux-arm:
docker: docker:
- image: electronbuilds/electron:0.0.4 - image: electronbuilds/electron:0.0.6
environment: environment:
TARGET_ARCH: arm TARGET_ARCH: arm
resource_class: 2xlarge resource_class: 2xlarge
@ -83,7 +83,7 @@ jobs:
docker run --rm --privileged multiarch/qemu-user-static:register --reset docker run --rm --privileged multiarch/qemu-user-static:register --reset
docker run -it \ docker run -it \
--mount type=bind,source=/tmp/workspace,target=/tmp/workspace \ --mount type=bind,source=/tmp/workspace,target=/tmp/workspace \
--rm electronbuilds/electronarm7:0.0.4 > version.txt --rm electronbuilds/electronarm7:0.0.5 > version.txt
cat version.txt cat version.txt
if grep -q `script/get-version.py` version.txt; then if grep -q `script/get-version.py` version.txt; then
echo "Versions match" echo "Versions match"
@ -96,7 +96,7 @@ jobs:
fi fi
electron-linux-arm64: electron-linux-arm64:
docker: docker:
- image: electronbuilds/electron:0.0.4 - image: electronbuilds/electron:0.0.6
environment: environment:
TARGET_ARCH: arm64 TARGET_ARCH: arm64
resource_class: 2xlarge resource_class: 2xlarge
@ -176,7 +176,7 @@ jobs:
docker run --rm --privileged multiarch/qemu-user-static:register --reset docker run --rm --privileged multiarch/qemu-user-static:register --reset
docker run -it \ docker run -it \
--mount type=bind,source=/tmp/workspace,target=/tmp/workspace \ --mount type=bind,source=/tmp/workspace,target=/tmp/workspace \
--rm electronbuilds/electronarm64:0.0.5 > version.txt --rm electronbuilds/electronarm64:0.0.6 > version.txt
cat version.txt cat version.txt
if grep -q `script/get-version.py` version.txt; then if grep -q `script/get-version.py` version.txt; then
echo "Versions match" echo "Versions match"
@ -278,7 +278,7 @@ jobs:
path: junit path: junit
electron-linux-mips64el: electron-linux-mips64el:
docker: docker:
- image: electronbuilds/electron:0.0.4 - image: electronbuilds/electron:0.0.6
environment: environment:
TARGET_ARCH: mips64el TARGET_ARCH: mips64el
resource_class: xlarge resource_class: xlarge
@ -336,7 +336,7 @@ jobs:
electron-linux-x64: electron-linux-x64:
docker: docker:
- image: electronbuilds/electron:0.0.4 - image: electronbuilds/electron:0.0.6
environment: environment:
TARGET_ARCH: x64 TARGET_ARCH: x64
DISPLAY: ':99.0' DISPLAY: ':99.0'

Просмотреть файл

@ -16,6 +16,9 @@ RUN apt-get install -y wget
# Install python-dbusmock # Install python-dbusmock
RUN apt-get install -y python-dbusmock RUN apt-get install -y python-dbusmock
# Install libnotify
RUN apt-get install -y libnotify-bin
# Add xvfb init script # Add xvfb init script
ADD tools/xvfb-init.sh /etc/init.d/xvfb ADD tools/xvfb-init.sh /etc/init.d/xvfb
RUN chmod a+x /etc/init.d/xvfb RUN chmod a+x /etc/init.d/xvfb

Просмотреть файл

@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y\
libgnome-keyring-dev \ libgnome-keyring-dev \
libgtk-3-0 \ libgtk-3-0 \
libgtk-3-dev \ libgtk-3-dev \
libnotify-bin \
libnotify-dev \ libnotify-dev \
libnss3 \ libnss3 \
libnss3-dev \ libnss3-dev \

Просмотреть файл

@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y\
libgnome-keyring-dev \ libgnome-keyring-dev \
libgtk-3-0 \ libgtk-3-0 \
libgtk-3-dev \ libgtk-3-dev \
libnotify-bin \
libnotify-dev \ libnotify-dev \
libnss3 \ libnss3 \
libnss3-dev \ libnss3-dev \

Просмотреть файл

@ -12,6 +12,9 @@ RUN apt-get install -y wget
# Install python-dbusmock # Install python-dbusmock
RUN apt-get install -y python-dbusmock RUN apt-get install -y python-dbusmock
# Install libnotify
RUN apt-get install -y libnotify-bin
# Add xvfb init script # Add xvfb init script
ADD tools/xvfb-init.sh /etc/init.d/xvfb ADD tools/xvfb-init.sh /etc/init.d/xvfb
RUN chmod a+x /etc/init.d/xvfb RUN chmod a+x /etc/init.d/xvfb