Merge branch 'dev' into f-server-144

.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
@@ -70,8 +74,11 @@ build-testenv:
   image: docker:20.10
   stage: setup
   timeout: 3h
-  only:
-    - schedules
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE != "schedule"
+      changes:
+        - src/test/docker/Dockerfile
   script:
     - cd src/test/docker
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -136,9 +143,8 @@ trigger_inttest:
 pages_prepare: &pages_prepare
   tags: [ cached-dind ]
   stage: deploy
-  only:
-    refs:
-      - /^release-.*$/i
+  rules:
+    - if: $CI_COMMIT_REF_NAME =~ /^release-.*$/i
   script:
     - echo "Deploying..."
     - make doc
@@ -148,6 +154,5 @@ pages_prepare: &pages_prepare
       - public
 pages:
   <<: *pages_prepare
-  only:
-    refs:
-      - main
+  rules:
+    - if: $CI_COMMIT_REF_NAME == 'main'

src/test/docker/Dockerfile

@@ -3,6 +3,9 @@ RUN apt-get update && \
   apt-get install -y \
     git make mariadb-server maven openjdk-11-jdk-headless \
     plantuml \
+    libtiff5-dev libjpeg-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