Merge pull request #105 from gdisdevops/docker-test

Fix arm64 image
DaspawnW · Feb 8, 2024 · 9037143 · 9037143
2 parents 3d8894a + 56011be
commit 9037143
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
@@ -11,10 +11,10 @@ jobs:
     strategy:
       matrix:
         kubernetes_version:
-          - "kindest/node:v1.26.0@sha256:691e24bd2417609db7e589e1a479b902d2e209892a10ce375fab60a8407c7352"
-          - "kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1"
-          - "kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315"
-          - "kindest/node:v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61"
+          - "kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144"
+          - "kindest/node:v1.28.6@sha256:b7e1cf6b2b729f604133c667a6be8aab6f4dde5bb042c1891ae248d9154f665b"
+          - "kindest/node:v1.27.10@sha256:3700c811144e24a6c6181065265f69b9bf0b437c45741017182d7c82b908918f"
+          - "kindest/node:v1.26.13@sha256:15ae92d507b7d4aec6e8920d358fc63d3b980493db191d7327541fbaaed1f789"
 
     steps:
       - uses: actions/checkout@v3
@@ -68,6 +68,6 @@ jobs:
           docker-tag: "${{ steps.vars.outputs.tag }}"
           ghcr-enabled: "true"
           ghcr-token: "${{ secrets.GITHUB_TOKEN }}"
-          ecr-enabled: "true"
+          ecr-enabled: ${{ github.repository == 'daspawnw/vault-crd' }}
           ecr-role-to-assume: "${{ secrets.AWS_PUBLIC_ECR_ARN }}"
           ecr-repository-url: "public.ecr.aws/l2l6k4u5/vault-crd"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/java17:nonroot AS SECURITY
+FROM gcr.io/distroless/java17-debian11:nonroot AS SECURITY
 FROM openjdk:17 AS BUILD
 
 COPY . /opt
@@ -11,10 +11,11 @@ COPY --from=SECURITY /etc/java-17-openjdk/security/java.security /java.security
 RUN echo "networkaddress.cache.ttl=60" >> /java.security
 RUN sed -i -e "s@^securerandom.source=.*@securerandom.source=${JAVA_RANDOM}@" /java.security
 
-FROM gcr.io/distroless/java17:nonroot
+FROM gcr.io/distroless/java17-debian11:nonroot
 
 COPY --from=BUILD /opt/target/vault-crd.jar /opt/vault-crd.jar
 COPY --from=BUILD /java.security /etc/java-17-openjdk/security/java.security
 
 ENTRYPOINT ["/usr/bin/java", "-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts", "-Djavax.net.ssl.trustStorePassword=changeit", "-Djavax.net.ssl.trustStoreType=jks", "-Dkeystore.pkcs12.legacy"]
 CMD ["-jar", "/opt/vault-crd.jar"]
+