11.2: * [Docker] Updated the Docker examples with automatic configuration from .env.

Author: jstanden

install/docker/.env.template

@@ -0,0 +1,2 @@
+CERB_SERVICE_TOKEN=sk_docker_token
+CERB_SERVICE_SCOPE='cron update'

install/docker/Dockerfile

@@ -8,6 +8,7 @@ VOLUME /var/www/html/
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
+    gettext-base \
     php8.3-bcmath \
     php8.3-curl \
     php8.3-dom \

install/docker/_conf/cerb.config.php

@@ -1,22 +1,2 @@
 <?php
-const APP_DB_HOST = 'mysql';
-const APP_DB_USER = 'cerb';
-const APP_DB_PASS = 's3cr3t';
-const APP_DB_DATABASE = 'cerb';
-
-const APP_SERVICE_TOKEN = 'sk_docker_token';
-const APP_SERVICE_TOKEN_SCOPE = 'cron update';
-
-const DEVELOPMENT_MODE = true;
-
-/****************************************************************************
- * [JAS]: Don't change the following unless you know what you're doing!
- ***************************************************************************/
-define('APP_PATH',dirname(__FILE__));
-const APP_STORAGE_PATH = APP_PATH . '/storage';
-const APP_TEMP_PATH = APP_STORAGE_PATH . '/tmp';
-const DEVBLOCKS_PATH = APP_PATH . '/libs/devblocks/';
-const DEVBLOCKS_REWRITE = true;
-const APP_DEFAULT_CONTROLLER = 'core.controller.page';
-
-require_once(DEVBLOCKS_PATH . 'framework.defaults.php');
+// This file will be automatically generated by the container

install/docker/_conf/cerb.config.template.php

@@ -0,0 +1,22 @@
+<?php
+const APP_DB_HOST = '${CERB_DB_HOST}';
+const APP_DB_USER = '${CERB_DB_USER}';
+const APP_DB_PASS = '${CERB_DB_PASS}';
+const APP_DB_DATABASE = '${CERB_DB_NAME}';
+
+const APP_SERVICE_TOKEN = '${CERB_SERVICE_TOKEN}';
+const APP_SERVICE_TOKEN_SCOPE = '${CERB_SERVICE_TOKEN_SCOPE}';
+
+const DEVELOPMENT_MODE = true;
+
+/****************************************************************************
+ * [JAS]: Don't change the following unless you know what you're doing!
+ ***************************************************************************/
+define('APP_PATH',dirname(__FILE__));
+const APP_STORAGE_PATH = APP_PATH . '/storage';
+const APP_TEMP_PATH = APP_STORAGE_PATH . '/tmp';
+const DEVBLOCKS_PATH = APP_PATH . '/libs/devblocks/';
+const DEVBLOCKS_REWRITE = true;
+const APP_DEFAULT_CONTROLLER = 'core.controller.page';
+
+require_once(DEVBLOCKS_PATH . 'framework.defaults.php');

install/docker/_conf/entry.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
 chown www-data:www-data /var/www/html/storage \
 && chmod 0770 /var/www/html/storage \
+&& envsubst "\$CERB_DB_HOST \$CERB_DB_NAME \$CERB_DB_USER \$CERB_DB_PASS \$CERB_SERVICE_TOKEN \$CERB_SERVICE_TOKEN_SCOPE" \
+  < /tmp/cerb.framework.config.template > /var/www/html/framework.config.php \
 && php-fpm8.3 -F

install/docker/dev/Dockerfile

@@ -20,10 +20,16 @@ services:
     depends_on:
       - mysql
     environment:
+      CERB_DB_HOST: mysql
+      CERB_DB_NAME: ${MYSQL_DATABASE:-cerb}
+      CERB_DB_USER: ${MYSQL_USER:-cerb}
+      CERB_DB_PASS: ${MYSQL_PASSWORD:-s3cr3t}
       CERB_SERVICE_TOKEN: ${CERB_SERVICE_TOKEN:-sk_docker_token}
+      CERB_SERVICE_TOKEN_SCOPE: ${CERB_SERVICE_TOKEN_SCOPE:-cron update}
     volumes:
       - ../..:/var/www/html:ro
-      - ./_conf/cerb.config.php:/var/www/html/framework.config.php:ro
+      - ./_conf/cerb.config.template.php:/tmp/cerb.framework.config.template:ro
+      - ./_conf/cerb.config.php:/var/www/html/framework.config.php
       - storage:/var/www/html/storage
   mysql:
     image: mysql:8.4