Dockerfile: Fjerner .gitignore fra trustcerts før import

DirektoratetForByggkvalitet · Jun 27, 2024 · 3af0b8a · 3af0b8a
1 parent 6b6307e
commit 3af0b8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/prime-cert-cache.yml b/.github/workflows/prime-cert-cache.yml
@@ -12,14 +12,14 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Henter inn CA-sertifikater fra cache
+      if: 
       uses: actions/cache@v4
       id: ca-certs-cache
       env:
         cache-name: ca-certs-cache
       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
@@ -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; \