diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fbeb3c4cb88ee7666f461010019598cd48b9066..885b791421f5ddef4014692409e9358d7e6c507d 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 4613078b9ef81d06abf0f865b515043e8f779eb8..58e0a995b2eee61b74bb4213bbd050e08f8c810d 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