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; \