From 15e14d911ebc02d7755390f9cae353eb96e04327 Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <andreas.romeyke@slub-dresden.de>
Date: Fri, 6 Jan 2023 10:17:32 +0100
Subject: [PATCH] - fix, make needs to be called with "-e" to allow explicite
ROSETTASDK setting
---
.gitlab-ci.yml | 5 +++--
gitlab-ci/Dockerfile | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aea62f2..e8cc372 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,8 +59,9 @@ test-job:
script:
- ls -lha /exlibris/
- ROSETTASDK=$ROSETTASDK make check_prerequisites
- - /usr/sbin/clamd --debug || cat /var/log/clamav/clamav.log
- - ROSETTASDK=$ROSETTASDK make test
+ - mkdir -p /var/run/clamav && chown -R clamav.root /var/run/clamav
+ - /usr/sbin/clamd || cat /var/log/clamav/clamav.log
+ - ROSETTASDK=$ROSETTASDK make -e test
packaging-job:
stage: packaging
diff --git a/gitlab-ci/Dockerfile b/gitlab-ci/Dockerfile
index e27134b..26cfff5 100644
--- a/gitlab-ci/Dockerfile
+++ b/gitlab-ci/Dockerfile
@@ -27,4 +27,3 @@ RUN git clone https://github.com/ExLibrisGroup/Rosetta.dps-sdk-projects.git
RUN ln -s ${EXLIBRIS_REPODIR} ${EXLIBRIS_PATH}
RUN echo TCPSocket 3310 >> /etc/clamav/clamd.conf ; echo TCPAddr 127.0.0.1 >> /etc/clamav/clamd.conf
RUN /usr/bin/freshclam
-RUN mkdir -p /var/run/clamav && chown -R clamav.root /var/run/clamav
--
GitLab