From b4eee67475353963fbc5991d5ec531d3296b8cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <joerg.sachse@slub-dresden.de>
Date: Fri, 7 Feb 2025 10:12:55 +0100
Subject: [PATCH] Fix CI & update versions
---
.gitlab-ci.yml | 7 ++++---
Makefile | 3 ++-
gitlab-ci/Dockerfile | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29d9c03..4fe9972 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,9 @@ stages: # List of stages for jobs, and their order of execution
variables:
EXLIBRIS_SDK_DIR: "/exlibris"
- ROSETTASDK: "${EXLIBRIS_SDK_DIR}/7.3/lib/"
- IMAGE_TARGET: "$CI_REGISTRY_IMAGE/bullseye_subapp"
+ # ROSETTASDK: "${EXLIBRIS_SDK_DIR}/7.3/lib/"
+ ROSETTASDK: "${EXLIBRIS_SDK_DIR}/8.2/lib/"
+ IMAGE_TARGET: "$CI_REGISTRY_IMAGE/bookworm_mediaconch_plugin4rosetta"
FF_USE_FASTZIP: "true"
# These can be specified per job or per pipeline
ARTIFACT_COMPRESSION_LEVEL: "fast"
@@ -35,7 +36,7 @@ build-env-job: # This job runs in the build stage, which runs first.
# docu: https://docs.gitlab.com/ee/ci/docker/using_kaniko.html, this is basically copy-pasted from there
script:
- mkdir -p /kaniko/.docker
- - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"},\"$(printf "%s" "$CI_DEPENDENCY_PROXY_SERVER" | cut -d':' -f1)\":{\"auth\":\"$(printf "%s:%s" "$CI_DEPENDENCY_PROXY_USER" "$CI_DEPENDENCY_PROXY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
+ - echo "{\"auths\":{\"${HARBOR_HOST}\":{\"auth\":\"$(echo -n ${HARBOR_USERNAME}:${HARBOR_PASSWORD} | base64 | tr -d '\n')\"}},\"$(printf "%s" "$CI_DEPENDENCY_PROXY_SERVER" | cut -d':' -f1)\":{\"auth\":\"$(printf "%s:%s" "$CI_DEPENDENCY_PROXY_USER" "$CI_DEPENDENCY_PROXY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json;
# In this task, Kaniko executor is called to build the Image based on the Dockerfile provided with "--dockerfile".
- echo "CI_PROJECT_DIR=${CI_PROJECT_DIR}"
- >-
diff --git a/Makefile b/Makefile
index 2741a90..59458e1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ JAVAPATH=$(wildcard /usr/lib/jvm/java-1.17.0-openjdk-*/bin/)
JAVARELEASE=17
# Verwendete Rosetta-Version
-ROSETTAVERSION:=7.3.0
+# ROSETTAVERSION:=7.3.0
+ROSETTAVERSION:=8.2.0
# Pfad zum Rosetta-SDK
ROSETTASDK:=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/lib/
diff --git a/gitlab-ci/Dockerfile b/gitlab-ci/Dockerfile
index 71b05e8..5661c58 100644
--- a/gitlab-ci/Dockerfile
+++ b/gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.slub-dresden.de/debian-packaging/dependency_proxy/containers/debian:bullseye-slim
+FROM sdvharbor.slub-dresden.de/replication/debian:stable-slim
ARG GITDIR
ENV DEBIAN_FRONTEND=noninteractive
@@ -9,7 +9,7 @@ ENV EXLIBRIS_PATH=/exlibris
RUN apt-get update; \
apt-get install -y --no-install-recommends gnupg wget; \
wget -O - http://sdvdebianrepo.slub-dresden.de/deb-repository/pub.gpg.key | apt-key add - ; \
- echo "deb http://sdvdebianrepo.slub-dresden.de/deb-repository bullseye main" > /etc/apt/sources.list.d/slub.list;
+ echo "deb http://sdvdebianrepo.slub-dresden.de/deb-repository bookworm main" > /etc/apt/sources.list.d/slub.list;
RUN apt-get update; \
apt-get -y upgrade; \
--
GitLab