Merge pull request #128 from wbstack/de/extra-tls

3.0: adjust entrypoint and add extra tls

Author: deer-wmde

.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@v3.0.8
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

CHANGELOG.md

@@ -1,5 +1,9 @@
 # cradle
 
+## March 2025
+- 3.0 - adjust entrypoint
+  - Install extra tls CA cert if it exists
+
 ## March 2021
 
 - 2.0 - PHP 7.3, Apache & API config change

Dockerfile

@@ -17,3 +17,9 @@ RUN sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" /etc/apache2/apache2.conf
 COPY --from=composer --chown=www-data:www-data /installing /var/www/html/cradle
 
 ADD ./docker/config.js /var/www/html/cradle/public_html/config.js
+
+COPY docker/entrypoint.sh /entrypoint.sh
+COPY docker/php.ini /usr/local/etc/php/conf.d/php.ini
+
+ENTRYPOINT ["/bin/bash"]
+CMD ["/entrypoint.sh"]

docker/entrypoint.sh

@@ -0,0 +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

docker/php.ini

@@ -0,0 +1 @@
+date.timezone = "UTC"