diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77afda4c991e4cc24db8fd12845f3ab593a04cfa..6e64db0bd9ca4831696cc0a95002ba48d30d909f 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 ccdb25d64baed375a291ca563c4c23cb070e4fa3..74e3b53f10ad77844396968b47b4a1636ca982a3 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 23c4a09e7aad737bbfd16f1d5c2aa86726fcaf49..a602fc30dc17125b9c3309a10b73b6417e74a940 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" \