From 3af0b8af93ac5e44b3ca53861e0f968d432c2e12 Mon Sep 17 00:00:00 2001
From: Eirik Wulff <ew@dibk.no>
Date: Thu, 27 Jun 2024 09:33:40 +0200
Subject: [PATCH] =?UTF-8?q?Dockerfile:=20Fjerner=20.gitignore=20fra=20trus?=
 =?UTF-8?q?tcerts=20f=C3=B8r=20import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/prime-cert-cache.yml | 2 +-
 docker/Dockerfile                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/prime-cert-cache.yml b/.github/workflows/prime-cert-cache.yml
index 3328ce2..db5023b 100644
--- a/.github/workflows/prime-cert-cache.yml
+++ b/.github/workflows/prime-cert-cache.yml
@@ -12,6 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Henter inn CA-sertifikater fra cache
+      if: 
       uses: actions/cache@v4
       id: ca-certs-cache
       env:
@@ -19,7 +20,6 @@ jobs:
       with:
         path: docker/trustcerts
         key: ${{env.cache-name}}-${{ hashFiles('docker/trustcerts/**.cer') }}
-        restore-keys: ${{ env.cache-name }}-
 
     - name: Henter inn CA-sertifikater uten cache
       if: steps.ca-certs-cache.outputs.cache-hit != 'true'
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a11a222..9044279 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,6 +19,7 @@ ENV APP_DIR=${APP_DIR}
 ADD docker/trustcerts /tmp/trustcerts
 RUN mkdir -p ${APP_DIR} && \
     echo "Importerer sertifikater til cacerts" && \
+    rm /tmp/trustcerts/.gitignore && \
     for FILE in /tmp/trustcerts/*; do \
         keytool -import -noprompt -trustcacerts -alias "${FILE%.*}" -file "${FILE}" \
         -keystore ${JAVA_HOME}/lib/security/cacerts -storepass changeit; \