From ce0dcc81ba7aeab0a9e57201c07fae6d4dee0338 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 2 Jan 2020 13:56:14 +0100
Subject: [PATCH] Use debian again for the docker CI image
It has a new enough firefox now
---
packages/common/.gitlab-ci.yml | 2 +-
packages/common/.gitlab-ci/Dockerfile | 6 +++---
packages/common/.gitlab-ci/build.sh | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/packages/common/.gitlab-ci.yml b/packages/common/.gitlab-ci.yml
index 14c05580..79aa682a 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:v2
+image: registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v4
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 3b830eaa..ccdb25d6 100644
--- a/packages/common/.gitlab-ci/Dockerfile
+++ b/packages/common/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM debian:buster
ENV LANG C.UTF-8
ENV DEBIAN_FRONTEND noninteractive
@@ -13,8 +13,8 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
RUN apt-get update && apt-get install -y \
nodejs \
- chromium-browser \
- firefox \
+ chromium \
+ firefox-esr \
composer \
php-zip \
rsync \
diff --git a/packages/common/.gitlab-ci/build.sh b/packages/common/.gitlab-ci/build.sh
index 1cd24820..01ca8e85 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:v3"
+TAG="registry.gitlab.tugraz.at/vpu/webcomponents/common/main:v4"
sudo docker build --tag "${TAG}" --file "Dockerfile" .
echo "Now run: sudo docker push '$TAG'"
--
GitLab