fix: reuse build artifacts

Sphereon-Opensource · Jan 16, 2025 · 24627f0 · 24627f0
1 parent ad423e4
commit 24627f0
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git a/.docker/admin-server/Dockerfile b/.docker/admin-server/Dockerfile
@@ -2,14 +2,14 @@ FROM openjdk:21-jdk AS builder
 RUN microdnf install findutils
 
 WORKDIR /app
-
 COPY . /app
-
 RUN chmod +x ./gradlew
 
-RUN ./gradlew :modules:admin-server:bootJar -x test -x allTests -x jsBrowserTest
+RUN if [ ! -f modules/admin-server/build/libs/admin-server-*.jar ]; then \
+    ./gradlew :modules:admin-server:bootJar -x test -x allTests -x jsBrowserTest; \
+    fi
 
-FROM openjdk:21-jdk AS runner
+FROM openjdk:21-jdk
 RUN microdnf install curl
 
 WORKDIR /app
@@ -22,4 +22,4 @@ RUN useradd -r -u 1002 -g root admin-server
 USER admin-server
 
 ENTRYPOINT ["java"]
-CMD ["-XX:MaxRAMPercentage=75.0", "-XX:InitialRAMPercentage=50.0", "-XX:+UseG1GC", "-jar", "admin-server.jar"]
+CMD ["-XX:MaxRAMPercentage=75.0", "-XX:InitialRAMPercentage=50.0", "-XX:+UseG1GC", "-jar", "admin-server.jar"]
diff --git a/.docker/federation-server/Dockerfile b/.docker/federation-server/Dockerfile
@@ -2,14 +2,14 @@ FROM openjdk:21-jdk AS builder
 RUN microdnf install findutils
 
 WORKDIR /app
-
 COPY . /app
-
 RUN chmod +x ./gradlew
 
-RUN ./gradlew :modules:federation-server:bootJar -x test -x allTests -x jsBrowserTest
+RUN if [ ! -f modules/federation-server/build/libs/federation-server-*.jar ]; then \
+    ./gradlew :modules:federation-server:bootJar -x test -x allTests -x jsBrowserTest; \
+    fi
 
-FROM openjdk:21-jdk AS runner
+FROM openjdk:21-jdk
 RUN microdnf install curl
 
 WORKDIR /app
@@ -22,4 +22,6 @@ RUN useradd -r -u 1001 -g root federation-server
 USER federation-server
 
 ENTRYPOINT ["java"]
-CMD ["-XX:MaxRAMPercentage=75.0", "-XX:InitialRAMPercentage=50.0", "-XX:+UseG1GC", "-jar", "federation-server.jar"]
+CMD ["-XX:MaxRAMPercentage=75.0", "-XX:InitialRAMPercentage=50.0", "-XX:+UseG1GC", "-jar", "federation-server.jar"]
+
+WORKDIR /app
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,6 +49,13 @@ jobs:
           ./gradlew publishJsPackageToNpmjsRegistry
           ./gradlew publishAllPublicationsToSphereon-opensourceRepository
 
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-artifacts
+          path: |
+            modules/federation-server/build/libs/federation-server-*.jar
+            modules/admin-server/build/libs/admin-server-*.jar
   auto-tag:
     needs: gradle
     runs-on: ubuntu-latest
@@ -130,6 +137,22 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: build-artifacts
+          path: ./
+
+      - name: Create directory structure
+        run: |
+          mkdir -p modules/federation-server/build/libs/
+          mkdir -p modules/admin-server/build/libs/
+          mv federation-server-*.jar modules/federation-server/build/libs/
+          mv admin-server-*.jar modules/admin-server/build/libs/
+
+      - name: List downloaded artifacts
+        run: ls -R modules/*/build/libs/
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -138,7 +161,6 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
       - name: Extract metadata (federation-server)
         id: meta-federation
         uses: docker/metadata-action@v5