From 1058fb86ab6d269468084cbefd5d02c3782bcddf Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 6 Apr 2020 17:53:56 +0200
Subject: [PATCH] ci: set MOZ_FORCE_DISABLE_E10S to work around firefox not
working under docker sometimes
---
packages/common/.gitlab-ci.yml | 2 +-
packages/common/.gitlab-ci/Dockerfile | 3 +++
packages/common/.gitlab-ci/build.sh | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/packages/common/.gitlab-ci.yml b/packages/common/.gitlab-ci.yml
index 79aa682a..7dcb7aa6 100644
--- a/packages/common/.gitlab-ci.yml
+++ b/packages/common/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v4
+image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v5
before_script:
- "sed -i 's|git@gitlab.tugraz.at:VPU|../..|g' .gitmodules"
diff --git a/packages/common/.gitlab-ci/Dockerfile b/packages/common/.gitlab-ci/Dockerfile
index ccdb25d6..74e3b53f 100644
--- a/packages/common/.gitlab-ci/Dockerfile
+++ b/packages/common/.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/packages/common/.gitlab-ci/build.sh b/packages/common/.gitlab-ci/build.sh
index 01ca8e85..e204355e 100755
--- a/packages/common/.gitlab-ci/build.sh
+++ b/packages/common/.gitlab-ci/build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
set -e
-TAG="registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v4"
+TAG="registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v5"
sudo docker build --tag "${TAG}" --file "Dockerfile" .
echo "Now run: sudo docker push '$TAG'"
--
GitLab