WIP

Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>

.gitlab-ci.yml

@@ -15,6 +15,7 @@ variables:
   APP_VERSION: "1.8.1"
   CHART_VERSION: "1.8.1"
   SUPPORTED_VERSIONS: "1.7.3, 1.8.0, 1.8.1"
+  SUPPORTED_ARCH: "linux/amd64,linux/arm64"
   MAINTAINED_SERVICES: "analyse-service, auth-service-init, dashboard-service, dashboard-service-init, data-service, metadata-service, search-db, search-service, search-service-init, storage-service-init, ui"
   CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}"
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
@@ -522,7 +523,8 @@ release-images:
   stage: release
   image: docker:${DOCKER_VERSION}-dind
   variables:
-    BUILDX_ARGS: --load --quiet
+    BUILD_ARGS: --network=host
+    COMPOSE_BUILD_ARGS: -q --parallel
   dependencies:
     - clean-images
     - test-analyse-service
@@ -540,13 +542,11 @@ release-images:
     - "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}"
     - "docker logout ${CI_REGISTRY2_URL}"
     - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
-    - "docker buildx create --name multiarch --driver docker-container --use"
   script:
-    - docker buildx build --platform linux/amd64 $BUILDX_ARGS -t dbrepo-core:build --target build ./lib/java/dbrepo-core
-    - docker buildx build --platform linux/arm64 $BUILDX_ARGS -t dbrepo-core:build --target build ./lib/java/dbrepo-core
-    - docker buildx build $BUILDX_ARGS -t dbrepo-data-service:build --target build dbrepo-data-service
-    - docker buildx build $BUILDX_ARGS -t dbrepo-metadata-service:build --target build dbrepo-metadata-service
-    - docker compose build -q --parallel
+    - docker build $BUILD_ARGS -t dbrepo-core:build --target build ./lib/java/dbrepo-core
+    - docker build $BUILD_ARGS -t dbrepo-data-service:build --target build ./dbrepo-data-service
+    - docker build $BUILD_ARGS -t dbrepo-metadata-service:build --target build ./dbrepo-metadata-service
+    - docker compose build $COMPOSE_BUILD_ARGS
     - docker tag dbrepo-analyse-service:latest "${CI_REGISTRY2_URL}/analyse-service:${APP_VERSION}${BUILD_VERSION}"
     - docker tag dbrepo-auth-service-init:latest "${CI_REGISTRY2_URL}/auth-service-init:${APP_VERSION}${BUILD_VERSION}"
     - docker tag dbrepo-dashboard-service:latest "${CI_REGISTRY2_URL}/dashboard-service:${APP_VERSION}${BUILD_VERSION}"

dbrepo-analyse-service/Dockerfile

-FROM --platform=$BUILDPLATFORM python:3.11-alpine3.21
+FROM python:3.11-alpine3.21
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk --no-cache add \

dbrepo-dashboard-service/Dockerfile

-FROM --platform=$BUILDPLATFORM python:3.11-alpine3.21
+FROM python:3.11-alpine3.21
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk add --no-cache \

dbrepo-data-service/Dockerfile

 ###### FIRST STAGE ######
-FROM --platform=$BUILDPLATFORM dbrepo-core:build AS dependency
+FROM dbrepo-core:build AS dependency
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 ###### SECOND STAGE ######
-FROM --platform=$BUILDPLATFORM maven:3-amazoncorretto-17 AS build
+FROM maven:3-amazoncorretto-17 AS build
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 COPY ./pom.xml ./
@@ -21,7 +21,7 @@ COPY ./services ./services
 RUN mvn -fn clean package -DskipTests
 
 ###### THIRD STAGE ######
-FROM --platform=$BUILDPLATFORM amazoncorretto:17-alpine3.19 AS runtime
+FROM amazoncorretto:17-alpine3.19 AS runtime
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk add --no-cache curl bash jq

dbrepo-metadata-service/Dockerfile

 ###### FIRST STAGE ######
-FROM --platform=$BUILDPLATFORM dbrepo-core:build AS dependency
+FROM dbrepo-core:build AS dependency
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 ###### SECOND STAGE ######
-FROM --platform=$BUILDPLATFORM maven:3-amazoncorretto-17 AS build
+FROM maven:3-amazoncorretto-17 AS build
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 COPY ./pom.xml ./
@@ -22,7 +22,7 @@ COPY ./services ./services
 RUN mvn -fn clean package -DskipTests
 
 ###### THIRD STAGE ######
-FROM --platform=$BUILDPLATFORM amazoncorretto:17-alpine3.19 AS runtime
+FROM amazoncorretto:17-alpine3.19 AS runtime
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk add --no-cache curl bash jq

dbrepo-search-service/Dockerfile

-FROM --platform=$BUILDPLATFORM python:3.11-alpine3.21
+FROM python:3.11-alpine3.21
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk add --no-cache \

dbrepo-search-service/init.Dockerfile

-FROM --platform=$BUILDPLATFORM python:3.11-alpine3.21
+FROM python:3.11-alpine3.21
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk add --no-cache \

dbrepo-ui/Dockerfile

 ###### FIRST STAGE ######
-FROM --platform=$BUILDPLATFORM oven/bun:1.1.40-alpine AS build
+FROM oven/bun:1.1.40-alpine AS build
 
 WORKDIR /app
 
@@ -27,7 +27,7 @@ COPY ./nuxt.config.ts ./nuxt.config.ts
 RUN bun run build
 
 ###### SECOND STAGE ######
-FROM --platform=$BUILDPLATFORM node:22.9.0-alpine3.20 AS runtime
+FROM node:22.9.0-alpine3.20 AS runtime
 
 ARG APP_VERSION="latest"
 ARG COMMIT=""

lib/java/dbrepo-core/Dockerfile

 ###### FIRST STAGE ######
-FROM maven:3-amazoncorretto-17 AS build
+FROM --platform=$BUILDPLATFORM maven:3-amazoncorretto-17 AS build
 LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 COPY ./pom.xml ./