Sheldan/Sissi
1
0
Fork 0
mirror of https://github.com/Sheldan/Sissi.git synced 2026-01-01 07:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SIS-xxx] fixing dependencies for docker packaging build

Browse Source
This commit is contained in:
Sheldan
2025-08-06 00:00:56 +02:00
parent 14d90722b7
commit 48c06cf370
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/image-packaging/src/main/docker/db-data/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.19.1 FROM alpine:3.22.1
MAINTAINER Sheldan MAINTAINER Sheldan
ADD config/ /var/db-config/ ADD config/ /var/db-config/
ADD liquibase-artifacts /var/db-config/liquibase-zips ADD liquibase-artifacts /var/db-config/liquibase-zips

2
deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile
View File

@@ -4,7 +4,7 @@ ARG VERSION
ARG ABSTRACTO_VERSION ARG ABSTRACTO_VERSION
FROM ${REGISTRY_PREFIX}abstracto-rest-api-image-gen:${ABSTRACTO_VERSION:-latest} AS image-gen-api 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 FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest} AS running-image
COPY --from=image-gen-api /python /python COPY --from=image-gen-api /python /python

2
deployment/image-packaging/src/main/docker/rest-api/Dockerfile
View File

@@ -2,7 +2,7 @@ ARG REGISTRY_PREFIX
ARG SISSI_REGISTRY_PREFIX ARG SISSI_REGISTRY_PREFIX
ARG VERSION ARG VERSION
ARG ABSTRACTO_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-experience:${ABSTRACTO_VERSION:-latest} AS experience-api
FROM ${REGISTRY_PREFIX}abstracto-rest-api-core:${ABSTRACTO_VERSION:-latest} AS core-api FROM ${REGISTRY_PREFIX}abstracto-rest-api-core:${ABSTRACTO_VERSION:-latest} AS core-api

2
deployment/image-packaging/src/main/docker/sissi/Dockerfile
View File

@@ -12,7 +12,7 @@ RUN $JAVA_HOME/bin/jlink \
--compress=2 \ --compress=2 \
--output /customjre --output /customjre
FROM alpine:3.21 FROM alpine:3.22.1
ENV JAVA_HOME=/jre ENV JAVA_HOME=/jre
ENV PATH="${JAVA_HOME}/bin:${PATH}" ENV PATH="${JAVA_HOME}/bin:${PATH}"

2
deployment/image-packaging/src/main/docker/template-data/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.19.1 FROM alpine:3.22.1
MAINTAINER Sheldan MAINTAINER Sheldan
ADD config /var/template-config/ ADD config /var/template-config/
ADD template-artifacts /var/template-config/templates ADD template-artifacts /var/template-config/templates

9
docker-compose.yml
View File

@@ -1,4 +1,3 @@
version: "3.7"
services: services:
bot-packaging: bot-packaging:
@@ -23,9 +22,9 @@ services:
REGISTRY_PREFIX: ${ABSTRACTO_PREFIX} REGISTRY_PREFIX: ${ABSTRACTO_PREFIX}
VERSION: ${VERSION} VERSION: ${VERSION}
ABSTRACTO_VERSION: ${ABSTRACTO_VERSION} ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
additional_contexts:
debra_rest: "service:debra-rest-api"
image: ${REGISTRY_PREFIX}sissi-rest-api:${VERSION:-latest} image: ${REGISTRY_PREFIX}sissi-rest-api:${VERSION:-latest}
depends_on:
- debra-rest-api
private-rest-api-packaging: private-rest-api-packaging:
build: build:
context: deployment/image-packaging/src/main/docker/private-rest-api context: deployment/image-packaging/src/main/docker/private-rest-api
@@ -34,9 +33,9 @@ services:
SISSI_REGISTRY_PREFIX: ${REGISTRY_PREFIX} SISSI_REGISTRY_PREFIX: ${REGISTRY_PREFIX}
ABSTRACTO_VERSION: ${ABSTRACTO_VERSION} ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
VERSION: ${VERSION} VERSION: ${VERSION}
additional_contexts:
image_gen: "service:image-gen-api"
image: ${REGISTRY_PREFIX}sissi-private-rest-api:${VERSION:-latest} image: ${REGISTRY_PREFIX}sissi-private-rest-api:${VERSION:-latest}
depends_on:
- image-gen-api
db-data: db-data:
build: build:
context: deployment/image-packaging/src/main/docker/db-data context: deployment/image-packaging/src/main/docker/db-data