Skip to content

Commit 55b52c4

Browse files
authored
Merge pull request #140 from wbstack/de/extra-tls
1.4: add extra tls cert install
2 parents 53b43b1 + bf71745 commit 55b52c4

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

.github/workflows/docker.build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: docker/setup-buildx-action@v1.6.0
3030
-
3131
name: Cache Docker layers
32-
uses: actions/cache@v2.1.6
32+
uses: actions/cache@v4
3333
with:
3434
path: /tmp/.buildx-cache
3535
key: ${{ runner.os }}-buildx-${{ github.sha }}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# widar
22

3+
## March 2025
4+
- 1.4
5+
- Install extra tls CA cert if it exists
6+
37
## Feburary 2022
48
- 1.3 - Update OAuth consumer version in magnustools
59

docker/entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
#!/usr/bin/env bash
22

3+
if [ -r '/usr/share/ca-certificates/extra/ca.crt' ]; then
4+
echo 'extra/ca.crt' >> /etc/ca-certificates.conf
5+
update-ca-certificates
6+
fi
7+
38
docker-php-entrypoint apache2-foreground

0 commit comments

Comments
 (0)