--wip-- [skip ci]

hyness · Oct 31, 2023 · 22b6a35 · 22b6a35
1 parent 3c60cff
commit 22b6a35
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/.github/workflows/dockerhub-deploy.yml b/.github/workflows/dockerhub-deploy.yml
@@ -113,6 +113,7 @@ jobs:
           java-version: ${{ matrix.jvmVersion }}
           distribution: 'temurin'
       - name: Build and push Java ${{ matrix.jvmVersion }} ${{ matrix.jvmType }} OCI image
+        if: ${{ matrix.builder == 'paketobuildpacks/builder:tiny' }}
         run: >
           ./gradlew bootBuildImage
           -PjvmType=${{ matrix.jvmType }}
@@ -123,3 +124,29 @@ jobs:
           --builder=${{ matrix.builder }}
           --imageName=$IMAGE:$CLOUD_CONFIG_BUILD_VERSION-$SHORT_SHA-$JAVA
           --publishImage
+      - name: Build and push Java ${{ matrix.jvmVersion }} ${{ matrix.jvmType }} OCI ARM image
+        if: ${{ matrix.builder == 'dashaun/builder-arm:tiny' }}
+        uses: uraimo/run-on-arch-action@v2
+        with:
+          arch: armv7
+          distro: alpine_latest
+          githubToken: ${{ github.token }}
+          env: | 
+            DOCKER_USERNAME: ${{ env.DOCKER_USERNAME }}
+            DOCKER_PASSWORD: ${{ env.DOCKER_PASSWORD }}
+#            BUILDER: ${{ matrix.builder }}
+#            DOCKER_USERNAME: ${{ env.DOCKER_USERNAME }}
+#            DOCKER_PASSWORD: ${{ env.DOCKER_PASSWORD }}
+#            IMAGE_NAME: ${{ env.IMAGE }}:${{ env.CLOUD_CONFIG_BUILD_VERSION }}-${{ env.SHORT_SHA }}-${{ env.JAVA }}
+#            JVM_TYPE=${{ matrix.jvmType }}
+#            JDK_VERSION=${{ matrix.jvmVersion }}
+          run: >
+            ./gradlew bootBuildImage
+            -PjvmType=jre
+            -PjdkVersion=17
+            -PdockerUsername=$DOCKER_USERNAME
+            -PdockerPassword=$DOCKER_PASSWORD
+            -PdockerTags=arm-test
+            --builder=dashaun/builder-arm:tiny
+            --imageName=ghcr.io/hyness/spring-cloud-config-server
+            --publishImage
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -37,16 +37,16 @@ tasks {
     }
 
     bootBuildImage {
-        applicationDirectory.set("/opt/spring-cloud-config-server")
-        builder.set("paketobuildpacks/builder:tiny")
-        docker.publishRegistry.username.set(dockerUsername)
-        docker.publishRegistry.password.set(dockerPassword)
+        applicationDirectory = "/opt/spring-cloud-config-server"
+        builder = "paketobuildpacks/builder:tiny"
+        docker.publishRegistry.username = dockerUsername
+        docker.publishRegistry.password = dockerPassword
         environment.put("BP_JVM_TYPE", jvmType)
         environment.put("BP_JVM_VERSION", jdkVersion)
         environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
         environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dspring.config.additional-location=optional:file:/config/")
-        imageName.set("hyness/spring-cloud-config-server")
-        tags.set(dockerTags?.split(',') ?: listOf())
+        imageName = "hyness/spring-cloud-config-server"
+        tags = dockerTags?.split(',') ?: listOf()
     }
 }