From 3eac06c61ffd9b23d39b37ad2a5f8133d927eeb6 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 7 Mar 2025 15:13:31 +0100 Subject: [PATCH 1/2] add extra tls cert install to entrypoint --- CHANGELOG.md | 4 ++++ docker/entrypoint.sh | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8414b3a..f9184c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # quickstatements +## March 2025 +- 1.4.0 + - Install extra tls CA cert if it exists + ## October 2024 - 1.3.7 - Update `magnustools` to correctly use https concept URI 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 3240a25db5f85f317e1414f19750e2473255f073 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 7 Mar 2025 15:42:33 +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 0512e4c..29377b4 100644 --- a/.github/workflows/docker.build.yml +++ b/.github/workflows/docker.build.yml @@ -29,7 +29,7 @@ jobs: uses: docker/setup-buildx-action@v2.4.1 - name: Cache Docker layers - uses: actions/cache@v3.2.6 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }}