From 2b13e9c2d451f0d391d7eff40cc683d06b9db192 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 7 Mar 2025 15:17:11 +0100 Subject: [PATCH 1/2] install extra tls cert --- CHANGELOG.md | 4 ++++ docker/entrypoint.sh | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31a9b0f..2b6cb1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # widar +## March 2025 +- 1.4 + - Install extra tls CA cert if it exists + ## Feburary 2022 - 1.3 - Update OAuth consumer version in magnustools diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index cc83b9f..dd400f7 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,3 +1,8 @@ #!/usr/bin/env bash +if [ -r '/usr/share/ca-certificates/extra/ca.crt' ]; then + echo 'extra/ca.crt' >> /etc/ca-certificates.conf + update-ca-certificates +fi + docker-php-entrypoint apache2-foreground From bf717456a05c3d52a1288f38356df024ae8e812b Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 7 Mar 2025 15:43:05 +0100 Subject: [PATCH 2/2] fix github workflow --- .github/workflows/docker.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml index 073165c..6ac496c 100644 --- a/.github/workflows/docker.build.yml +++ b/.github/workflows/docker.build.yml @@ -29,7 +29,7 @@ jobs: uses: docker/setup-buildx-action@v1.6.0 - name: Cache Docker layers - uses: actions/cache@v2.1.6 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }}