From 3a9298f8081747f6c6b90ca348a344a56f437087 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 13 Apr 2023 16:30:58 +0200
Subject: [PATCH] PIPELINE
---
.gitlab-ci.yml | 4 ++++
src/test/docker/Dockerfile | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fbeb3c4..885b7914 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,10 @@ variables:
CPPINT: ""
MYSQLBACKEND: ""
+workflow:
+ rules:
+ - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_NAME != $CI_COMMIT_TAG
+
image: $CI_REGISTRY_IMAGE
stages:
- info
diff --git a/src/test/docker/Dockerfile b/src/test/docker/Dockerfile
index 4613078b..58e0a995 100644
--- a/src/test/docker/Dockerfile
+++ b/src/test/docker/Dockerfile
@@ -3,7 +3,9 @@ RUN apt-get update && \
apt-get install -y \
git make mariadb-server maven openjdk-11-jdk-headless \
plantuml \
- libfreetype6-dev \
+ libtiff5-dev libjpeg8-dev libopenjp2-7-dev zlib1g-dev \
+ libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
+ libharfbuzz-dev libfribidi-dev libxcb1-dev \
python3-pip screen libpam0g-dev unzip curl shunit2 \
python3-sphinx
--
GitLab