Use multi-stage builds to unzip and copy jars

.github/workflows/coordinator-build-and-publish.yml

@@ -76,7 +76,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: Build dist
         run: |
-          ./gradlew coordinator:app:distZip --no-daemon
+          ./gradlew coordinator:app:installDist --no-daemon
       - name: Login to Docker Hub
         if: ${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}
         uses: docker/login-action@v3
@@ -98,7 +98,7 @@ jobs:
         if: ${{ env.PUSH_IMAGE == 'false' }}
         with:
           context: .
-          build-contexts: zip=./coordinator/app/build/distributions/
+          build-contexts: libs=./coordinator/app/build/install/coordinator/lib
           file: ./coordinator/Dockerfile
           platforms: linux/amd64
           load: true
@@ -120,7 +120,7 @@ jobs:
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
         with:
           context: .
-          build-contexts: zip=./coordinator/app/build/distributions/
+          build-contexts: libs=./coordinator/app/build/install/coordinator/lib
           file: ./coordinator/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true

.github/workflows/transaction-exclusion-api-build-and-publish.yml

@@ -76,7 +76,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: Build dist
         run: |
-          ./gradlew transaction-exclusion-api:app:distZip --no-daemon
+          ./gradlew transaction-exclusion-api:app:installDist --no-daemon
       - name: Login to Docker Hub
         if: ${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}
         uses: docker/login-action@v3
@@ -98,7 +98,7 @@ jobs:
         if: ${{ env.PUSH_IMAGE == 'false' }}
         with:
           context: .
-          build-contexts: zip=./transaction-exclusion-api/app/build/distributions/
+          build-contexts: libs=./transaction-exclusion-api/app/build/install/transaction-exclusion-api/lib
           file: ./transaction-exclusion-api/Dockerfile
           platforms: linux/amd64
           load: true
@@ -120,7 +120,7 @@ jobs:
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
         with:
           context: .
-          build-contexts: zip=./transaction-exclusion-api/app/build/distributions/
+          build-contexts: libs=./transaction-exclusion-api/app/build/install/transaction-exclusion-api/lib
           file: ./transaction-exclusion-api/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true

coordinator/Dockerfile

@@ -1,20 +1,38 @@
-FROM openjdk:22-ea-17-slim-bookworm
+# BUILDER image
+FROM eclipse-temurin:21-jdk-noble AS builder
 
-RUN apt-get update \
-	&& apt-get install curl -y \
-  && apt-get install unzip -y \
-	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
+RUN mkdir -p /libs
+COPY --from=libs ./** /libs
+WORKDIR /libs
+
+RUN mkdir -p unpacked-blob-compressor unpacked-blob-shnarf-calculator
+RUN bcJar=$(set -- blob-compressor*.jar; echo $1) && \
+    bscJar=$(set -- blob-shnarf-calculator*.jar; echo $1) && \
+    cd unpacked-blob-compressor/ && jar -xf ../$bcJar && cd .. && \
+    cd unpacked-blob-shnarf-calculator/ && jar -xf ../$bscJar && cd .. && \
+    rm -rf unpacked-blob-compressor/darwin-** unpacked-blob-shnarf-calculator/darwin-** && \
+    case $(uname -m) in \
+    x86_64) \
+      rm -rf unpacked-blob-compressor/linux-aarch64/; \
+      rm -rf unpacked-blob-shnarf-calculator/linux-aarch64/; \
+    ;; \
+    aarch64) \
+      rm -rf unpacked-blob-compressor/linux-x86-64/; \
+      rm -rf unpacked-blob-shnarf-calculator/linux-x86-64/; \
+    ;; \
+    esac && \
+    jar -cf $bcJar -C unpacked-blob-compressor . && \
+    jar -cf $bscJar -C unpacked-blob-shnarf-calculator .
+RUN rm -rf unpacked-blob-compressor unpacked-blob-shnarf-calculator
+
+# FINAL image
+FROM eclipse-temurin:21-jre-noble
 
 WORKDIR /opt/consensys/linea/coordinator
 
-# copy application
-COPY --from=zip ./coordinator.zip /opt/consensys/linea/coordinator/libs/
-RUN unzip libs/coordinator.zip -d libs/ && mv libs/coordinator/lib/** libs/ && rm -R libs/coordinator/
+RUN mkdir -p logs /tmp/prover/request /tmp/prover/response
 
-RUN mkdir -p /opt/consensys/linea/coordinator/logs
-RUN mkdir -p /opt/consensys/linea/coordinator/tmp/prover/request
-RUN mkdir -p /opt/consensys/linea/coordinator/tmp/prover/response
+COPY --from=builder /libs/** libs/
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
@@ -29,5 +47,3 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 	org.label-schema.vendor="ConsenSys" \
 	org.label-schema.version=$VERSION \
 	org.label-schema.schema-version="1.0"
-
-WORKDIR /opt/consensys/linea/coordinator/

transaction-exclusion-api/Dockerfile

@@ -1,22 +1,9 @@
-# BUILDER image
-FROM eclipse-temurin:21-jre-alpine AS builder
-WORKDIR /opt/consensys/linea/transaction-exclusion-api
-
-RUN apk add --no-cache unzip
-
-# copy application
-COPY --from=zip ./transaction-exclusion-api.zip libs/
-RUN unzip libs/transaction-exclusion-api.zip -d libs/ \
-	&& mv libs/transaction-exclusion-api/lib/** libs/ \
-	&& rm -R libs/transaction-exclusion-api/
-
-# FINAL image
 FROM eclipse-temurin:21-jre-alpine
 WORKDIR /opt/consensys/linea/transaction-exclusion-api/
 
-RUN mkdir -p /opt/consensys/linea/transaction-exclusion-api/logs/
+RUN mkdir -p logs
 
-COPY --from=builder /opt/consensys/linea/transaction-exclusion-api/libs libs/
+COPY --from=libs ./** libs/
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE