From 3d6173c0df1d572a6c1474a9c8a7aecf774dee58 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 25 Aug 2020 09:45:52 +0200
Subject: [PATCH] Install build packages which are required for cypress e2e
 tests

---
 Jenkinsfile      |  2 +-
 build/Dockerfile | 17 +++++++++++++++--
 build/Makefile   |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 688930d227..38841ade0f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -190,7 +190,7 @@ node('docker') {
 String mainBranch
 
 Maven setupMavenBuild() {
-  MavenWrapperInDocker mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.7_10")
+  MavenWrapperInDocker mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.8_10")
   mvn.enableDockerHost = true
 
   // disable logging durring the build
diff --git a/build/Dockerfile b/build/Dockerfile
index c9afa6992e..6ef5ff1cfb 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -22,7 +22,7 @@
 # SOFTWARE.
 #
 
-FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.7_10
+FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.8_10
 
 ENV DOCKER_VERSION=19.03.8 \
     DOCKER_CHANNEL=stable \
@@ -34,11 +34,24 @@ COPY modprobe.sh /usr/local/bin/modprobe
 # install required packages
 RUN set -eux; \
  apt-get update \
- && apt-get install -y \
+ && apt-get install --no-install-recommends -y \
     # mercurial is requried for integration tests of the scm-hg-plugin
     mercurial \
     # git is required by yarn install of scm-ui
     git \
+    # the following dependencies are required for cypress tests and are copied from
+    # https://github.com/cypress-io/cypress-docker-images/blob/master/base/12.18.3/Dockerfile
+    libgtk2.0-0 \
+    libgtk-3-0 \
+    libnotify-dev \
+    libgconf-2-4 \
+    libgbm-dev \
+    libnss3 \
+    libxss1 \
+    libasound2 \
+    libxtst6 \
+    xauth \
+    xvfb \
  # download docker
  && curl -o docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz \
  && echo "${DOCKER_CHECKSUM} docker-${DOCKER_VERSION}.tgz" > docker-${DOCKER_VERSION}.sha256sum \
diff --git a/build/Makefile b/build/Makefile
index 173df8bcb8..180b0db68d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,4 +1,4 @@
-VERSION:=11.0.7_10
+VERSION:=11.0.8_10
 
 .PHONY:build
 build: