Merge pull request #19

ci: linux/amd64 build
cybersokari · Jun 16, 2024 · bf525c5 · bf525c5
2 parents b259aac + e04ac10
commit bf525c5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 25 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -44,7 +44,9 @@ jobs:
           cp ${{ env.GOOGLE_APPLICATION_CREDENTIALS }} cred.json
 
       - name: Build Image
-        run: docker build -t web -f ${{vars.DOCKER_FILE_NAME}} . --build-arg PROJECT_ID=${{vars.PROJECT_ID}}
+        run: |
+          docker build -t web -f ${{vars.DOCKER_FILE_NAME}} . \
+            --build-arg PROJECT_ID=${{vars.PROJECT_ID}} --platform linux/amd64
 
       - name: Configure Docker for Artifact Registry
         run: gcloud auth configure-docker ${{vars.DOCKER_CRED_HELPER}} -q

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -9,6 +9,8 @@ services:
     environment:
       - GOOGLE_APPLICATION_CREDENTIALS=/gcp/cred.json
       - GCLOUD_PROJECT=gatedaccessdev
+    mem_limit: 512m
+    cpus: 1
   native:
     image: native
     ports:
@@ -17,4 +19,6 @@ services:
       - $HOME/.config/gcloud/application_default_credentials.json:/gcp/cred.json
     environment:
       - GOOGLE_APPLICATION_CREDENTIALS=/gcp/cred.json
-      - GCLOUD_PROJECT=gatedaccessdev
+      - GCLOUD_PROJECT=gatedaccessdev
+    mem_limit: 512m
+    cpus: 1
diff --git a/jvm.Dockerfile b/jvm.Dockerfile
@@ -27,7 +27,7 @@ RUN ./mvnw dependency:go-offline -DskipTests
 RUN ./mvnw package -DskipTests
 
 # Stage 2: Create the final Docker image
-FROM bellsoft/liberica-openjre-alpine as final
+FROM --platform=$TARGETPLATFORM bellsoft/liberica-openjre-alpine as final
 # Copy the application from the build stage
 COPY --from=build /app/target/web-0.0.1-SNAPSHOT.jar .
 # Command to run the application

diff --git a/native.Dockerfile b/native.Dockerfile
@@ -1,5 +1,5 @@
 # Build GraalVM native image
-FROM ghcr.io/graalvm/graalvm-ce:latest as build
+FROM --platform=$BUILDPLATFORM ghcr.io/graalvm/graalvm-ce:latest as build
 # GOOGLE_APPLICATION_CREDENTIALS and GCLOUD_PROJECT
 # environment variables are required for a successful
 # AOT compilation process, which starts the app
@@ -27,7 +27,7 @@ RUN ./mvnw dependency:go-offline -DskipTests
 RUN ./mvnw package -Pnative -DskipTests
 
 # Stage 2: Create the final Docker image
-FROM alpine:latest AS final
+FROM --platform=$TARGETPLATFORM alpine:latest AS final
 # Set the working directory
 WORKDIR /app
 # Installs the libc6-compat package, which provides

diff --git a/pom.xml b/pom.xml
@@ -125,25 +125,25 @@
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>
         <plugins>
             <!-- Jacoco plugin -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.12</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.jacoco</groupId>-->
+<!--                <artifactId>jacoco-maven-plugin</artifactId>-->
+<!--                <version>0.8.12</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <goals>-->
+<!--                            <goal>prepare-agent</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>report</id>-->
+<!--                        <phase>prepare-package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>report</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
             <!-- Surefire plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -277,7 +277,7 @@
                         <artifactId>native-maven-plugin</artifactId>
                         <extensions>true</extensions>
                         <configuration>
-                            <skipNativeTests>true</skipNativeTests>
+                            <skipNativeTests>false</skipNativeTests>
                             <buildArgs>
                                 <arg>--initialize-at-build-time=org.slf4j.helpers</arg>
                                 <!-- 3. Quick build mode -->