From 48c06cf370ff68ff8427d1314a10fc087e5f054f Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Wed, 6 Aug 2025 00:00:56 +0200
Subject: [PATCH] [SIS-xxx] fixing dependencies for docker packaging build

---
 .../image-packaging/src/main/docker/db-data/Dockerfile   | 2 +-
 .../src/main/docker/private-rest-api/Dockerfile          | 2 +-
 .../image-packaging/src/main/docker/rest-api/Dockerfile  | 2 +-
 .../image-packaging/src/main/docker/sissi/Dockerfile     | 2 +-
 .../src/main/docker/template-data/Dockerfile             | 2 +-
 docker-compose.yml                                       | 9 ++++-----
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/deployment/image-packaging/src/main/docker/db-data/Dockerfile b/deployment/image-packaging/src/main/docker/db-data/Dockerfile
index c24ca493..a057eefb 100644
--- a/deployment/image-packaging/src/main/docker/db-data/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/db-data/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.22.1
 MAINTAINER Sheldan
 ADD config/ /var/db-config/
 ADD liquibase-artifacts /var/db-config/liquibase-zips
diff --git a/deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile b/deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile
index 87bed736..13e87732 100644
--- a/deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile
@@ -4,7 +4,7 @@ ARG VERSION
 ARG ABSTRACTO_VERSION
 FROM ${REGISTRY_PREFIX}abstracto-rest-api-image-gen:${ABSTRACTO_VERSION:-latest} AS image-gen-api
 
-FROM ${SISSI_REGISTRY_PREFIX}sissi-image-gen-api:${VERSION:-latest} AS sissi-image-gen-api
+FROM image_gen AS sissi-image-gen-api
 
 FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest} AS running-image
 COPY --from=image-gen-api /python /python
diff --git a/deployment/image-packaging/src/main/docker/rest-api/Dockerfile b/deployment/image-packaging/src/main/docker/rest-api/Dockerfile
index 4519668a..9fd0dab3 100644
--- a/deployment/image-packaging/src/main/docker/rest-api/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/rest-api/Dockerfile
@@ -2,7 +2,7 @@ ARG REGISTRY_PREFIX
 ARG SISSI_REGISTRY_PREFIX
 ARG VERSION
 ARG ABSTRACTO_VERSION
-FROM ${SISSI_REGISTRY_PREFIX}sissi-debra-rest-api:${VERSION:-latest} AS debra-api
+FROM debra_rest AS debra-api
 FROM ${REGISTRY_PREFIX}abstracto-rest-api-experience:${ABSTRACTO_VERSION:-latest} AS experience-api
 FROM ${REGISTRY_PREFIX}abstracto-rest-api-core:${ABSTRACTO_VERSION:-latest} AS core-api
 
diff --git a/deployment/image-packaging/src/main/docker/sissi/Dockerfile b/deployment/image-packaging/src/main/docker/sissi/Dockerfile
index 0bfcce65..1fa310b1 100644
--- a/deployment/image-packaging/src/main/docker/sissi/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/sissi/Dockerfile
@@ -12,7 +12,7 @@ RUN $JAVA_HOME/bin/jlink \
          --compress=2 \
          --output /customjre
 
-FROM alpine:3.21
+FROM alpine:3.22.1
 
 ENV JAVA_HOME=/jre
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
diff --git a/deployment/image-packaging/src/main/docker/template-data/Dockerfile b/deployment/image-packaging/src/main/docker/template-data/Dockerfile
index 3412bf10..421cff7e 100644
--- a/deployment/image-packaging/src/main/docker/template-data/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/template-data/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.22.1
 MAINTAINER Sheldan
 ADD config /var/template-config/
 ADD template-artifacts /var/template-config/templates
diff --git a/docker-compose.yml b/docker-compose.yml
index 495d7dc3..59472b0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.7"
 
 services:
   bot-packaging:
@@ -23,9 +22,9 @@ services:
         REGISTRY_PREFIX: ${ABSTRACTO_PREFIX}
         VERSION: ${VERSION}
         ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
+      additional_contexts:
+        debra_rest: "service:debra-rest-api"
     image: ${REGISTRY_PREFIX}sissi-rest-api:${VERSION:-latest}
-    depends_on:
-      - debra-rest-api
   private-rest-api-packaging:
     build:
       context: deployment/image-packaging/src/main/docker/private-rest-api
@@ -34,9 +33,9 @@ services:
         SISSI_REGISTRY_PREFIX: ${REGISTRY_PREFIX}
         ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
         VERSION: ${VERSION}
+      additional_contexts:
+        image_gen: "service:image-gen-api"
     image: ${REGISTRY_PREFIX}sissi-private-rest-api:${VERSION:-latest}
-    depends_on:
-      - image-gen-api
   db-data:
     build:
       context: deployment/image-packaging/src/main/docker/db-data