From 648fa6eb5e20c9cb27f0b13aefb113fc86833e8c Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 6 Apr 2020 17:57:58 +0200
Subject: [PATCH] ci: set MOZ_FORCE_DISABLE_E10S=true
---
.gitlab-ci.yml | 2 +-
.gitlab-ci/Dockerfile | 3 +++
.gitlab-ci/build.sh | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77afda4..6e64db0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.tugraz.at/vpu/apps/signature/main:v1
+image: registry.gitlab.tugraz.at/vpu/apps/signature/main:v2
before_script:
- "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules"
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index ccdb25d..74e3b53 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -3,6 +3,9 @@ FROM debian:buster
ENV LANG C.UTF-8
ENV DEBIAN_FRONTEND noninteractive
+# https://github.com/karma-runner/karma-firefox-launcher/issues/104
+ENV MOZ_FORCE_DISABLE_E10S true
+
RUN apt-get update && apt-get install -y \
git \
curl \
diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index 23c4a09..a602fc3 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
-TAG="registry.gitlab.tugraz.at/vpu/apps/signature/main:v1"
+TAG="registry.gitlab.tugraz.at/vpu/apps/signature/main:v2"
sudo docker build --tag "${TAG}" --file "Dockerfile" .
sudo docker run --rm --security-opt label=disable \
--volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
--
GitLab