Creating docker images with native builds

Author: klakegg

.dockerignore

@@ -1,5 +1,5 @@
 *
-!target/*-runner
+!target/*-runner-*
 !target/*-runner.jar
 !target/lib/*
 !target/quarkus-app/*

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Build
       run: make build
 
-    - name: Upload artifact
+    - name: Upload artifact [target]
       uses: actions/upload-artifact@v4
       with:
         name: target
@@ -57,15 +57,22 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
-    - name: Download artifact
+    - name: Download artifact [target]
       uses: actions/download-artifact@v4
       with:
         name: target
         path: target
 
+    - name: Build and push [jvm-edge]
+      run: docker buildx build --push -t ghcr.io/javabin/submittheforce:jvm-edge -f src/main/docker/Dockerfile.jvm --platform linux/amd64,linux/arm64 .
+
     - name: Build and push [edge]
       run: docker buildx build --push -t ghcr.io/javabin/submittheforce:edge -f src/main/docker/Dockerfile.jvm --platform linux/amd64,linux/arm64 .
 
+    - name: Build and push [jvm-latest]
+      if: startsWith(github.ref, 'refs/tags/v')
+      run: docker buildx build --push -t ghcr.io/javabin/submittheforce:jvm-latest -f src/main/docker/Dockerfile.jvm --platform linux/amd64,linux/arm64 .
+
     - name: Build and push [latest]
       if: startsWith(github.ref, 'refs/tags/v')
       run: docker buildx build --push -t ghcr.io/javabin/submittheforce:latest -f src/main/docker/Dockerfile.jvm --platform linux/amd64,linux/arm64 .
@@ -90,7 +97,7 @@ jobs:
     - name: Build uber-JAR
       run: make build build-uber
 
-    - name: Upload artifact
+    - name: Upload artifact [uber-jar]
       uses: actions/upload-artifact@v4
       with:
         name: uber-jar
@@ -123,7 +130,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Download artifact
+      - name: Download artifact [target]
         uses: actions/download-artifact@v4
         with:
           name: target
@@ -135,7 +142,7 @@ jobs:
       - name: Rename file
         run: mv target/submit-runner target/submit-runner-linux-x86_64
 
-      - name: Upload artifact
+      - name: Upload artifact [native-amd64]
         uses: actions/upload-artifact@v4
         with:
           name: native-amd64
@@ -147,7 +154,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/v')
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          file: target/submit-runner-linux-amd64
+          file: target/submit-runner-linux-x86_64
           name: submit-runner-linux-amd64
           label: Native [amd64]
 
@@ -167,7 +174,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Download artifact
+      - name: Download artifact [target]
         uses: actions/download-artifact@v4
         with:
           name: target
@@ -179,7 +186,7 @@ jobs:
       - name: Rename file
         run: mv target/submit-runner target/submit-runner-linux-aarch64
 
-      - name: Upload artifact
+      - name: Upload artifact [native-arm64]
         uses: actions/upload-artifact@v4
         with:
           name: native-arm64
@@ -194,3 +201,46 @@ jobs:
           file: target/submit-runner-linux-aarch64
           name: submit-runner-linux-aarch64
           label: Native [arm64]
+
+  docker-native:
+    name: Docker [Native]
+    runs-on: ubuntu-latest
+    needs:
+      - native-amd64
+      - native-arm64
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Download artifact [native-amd64]
+        uses: actions/download-artifact@v4
+        with:
+          name: native-arm64
+          path: target
+
+      - name: Download artifact [native-amd64]
+        uses: actions/download-artifact@v4
+        with:
+          name: native-amd64
+          path: target
+
+      - name: Build and push [native-edge]
+        run: docker buildx build --push -t ghcr.io/javabin/submittheforce:native-edge -f src/main/docker/Dockerfile.jvm --platform linux/amd64,linux/arm64 .
+
+      - name: Build and push [native-latest]
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: docker buildx build --push -t ghcr.io/javabin/submittheforce:native-latest -f src/main/docker/Dockerfile.jvm --platform linux/amd64,linux/arm64 .

Makefile

@@ -5,7 +5,7 @@ build-uber:
 	@./mvnw package -B --no-transfer-progress package -Dquarkus.package.jar.type=uber-jar
 
 native:
-	@./mvnw package -Dnative -Dquarkus.native.container-build=true
+	@./mvnw package -B --no-transfer-progress -Dnative -Dquarkus.native.container-build=true
 
 clean:
 	@./mvnw clean -B --no-transfer-progress

src/main/docker/Dockerfile.native-micro

@@ -1,3 +1,9 @@
+# Adding fetch stage to build the native image for multiple architectures
+FROM alpine AS fetch
+
+ADD target /target
+RUN mv /target/*-runner-linux-$(uname -m) /target/application
+
 ####
 # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
 # It uses a micro base image, tuned for Quarkus native executables.
@@ -22,7 +28,9 @@ WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
     && chown 1001:root /work
-COPY --chown=1001:root target/*-runner /work/application
+
+# Modified to use the fetch stage
+COPY --from=fetch --chown=1001:root /target/application /work/application
 
 EXPOSE 8080
 USER 1001