From 5f48f91d948db9cca3266b324dabf8f26f9768bd Mon Sep 17 00:00:00 2001
From: Charles Kerr <ckerr@github.com>
Date: Fri, 9 Mar 2018 12:07:50 +0900
Subject: [PATCH] Newer CI images (#12188)

* 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
---
 .circleci/config.yml | 12 ++++++------
 Dockerfile           |  3 +++
 Dockerfile.arm64     |  1 +
 Dockerfile.armv7     |  1 +
 Dockerfile.circleci  |  3 +++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ab74924c3e9..93d7aeac32b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   electron-linux-arm:
     docker:
-      - image: electronbuilds/electron:0.0.4
+      - image: electronbuilds/electron:0.0.6
         environment:
           TARGET_ARCH: arm
     resource_class: 2xlarge
@@ -83,7 +83,7 @@ jobs:
               docker run --rm --privileged multiarch/qemu-user-static:register --reset
               docker run -it \
               --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
               if grep -q `script/get-version.py` version.txt; then
                 echo "Versions match"
@@ -96,7 +96,7 @@ jobs:
             fi
   electron-linux-arm64:
     docker:
-      - image: electronbuilds/electron:0.0.4
+      - image: electronbuilds/electron:0.0.6
         environment:
           TARGET_ARCH: arm64
     resource_class: 2xlarge
@@ -176,7 +176,7 @@ jobs:
               docker run --rm --privileged multiarch/qemu-user-static:register --reset
               docker run -it \
               --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
               if grep -q `script/get-version.py` version.txt; then
                 echo "Versions match"
@@ -278,7 +278,7 @@ jobs:
           path: junit
   electron-linux-mips64el:
     docker:
-      - image: electronbuilds/electron:0.0.4
+      - image: electronbuilds/electron:0.0.6
         environment:
           TARGET_ARCH: mips64el
     resource_class: xlarge
@@ -336,7 +336,7 @@ jobs:
 
   electron-linux-x64:
     docker:
-      - image: electronbuilds/electron:0.0.4
+      - image: electronbuilds/electron:0.0.6
         environment:
           TARGET_ARCH: x64
           DISPLAY: ':99.0'
diff --git a/Dockerfile b/Dockerfile
index 4cfea0e70f9..7a89b9fb80f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,9 @@ RUN apt-get install -y wget
 # Install python-dbusmock
 RUN apt-get install -y python-dbusmock
 
+# Install libnotify
+RUN apt-get install -y libnotify-bin
+
 # Add xvfb init script
 ADD tools/xvfb-init.sh /etc/init.d/xvfb
 RUN chmod a+x /etc/init.d/xvfb
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 30e31019e8b..721b8172693 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y\
  libgnome-keyring-dev \
  libgtk-3-0 \
  libgtk-3-dev \
+ libnotify-bin \
  libnotify-dev \
  libnss3 \
  libnss3-dev \
diff --git a/Dockerfile.armv7 b/Dockerfile.armv7
index bfbc6fb6806..94af8fb31fe 100644
--- a/Dockerfile.armv7
+++ b/Dockerfile.armv7
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y\
  libgnome-keyring-dev \
  libgtk-3-0 \
  libgtk-3-dev \
+ libnotify-bin \
  libnotify-dev \
  libnss3 \
  libnss3-dev \
diff --git a/Dockerfile.circleci b/Dockerfile.circleci
index 271947c56e3..502d9f45164 100644
--- a/Dockerfile.circleci
+++ b/Dockerfile.circleci
@@ -12,6 +12,9 @@ RUN apt-get install -y wget
 # Install python-dbusmock
 RUN apt-get install -y python-dbusmock
 
+# Install libnotify
+RUN apt-get install -y libnotify-bin
+
 # Add xvfb init script
 ADD tools/xvfb-init.sh /etc/init.d/xvfb
 RUN chmod a+x /etc/init.d/xvfb