Add optional XSL, customisable DB name/user

.env.sample

@@ -12,11 +12,16 @@ APP_ENV=prod
 
 ## Extra extensions you need (run `abra app YOURAPPDOMAIN run app "php -m"` to see active extensions)
 PHP_EXTENSIONS="pdo_mysql"
+## Install libxslt, required for PHP `xsl` extension
+#INSTALL_XSL=1
 
 # Optional database
 #COMPOSE_FILE="compose.yml:compose.mariadb.yml"
 SECRET_DB_ROOT_PASSWORD_VERSION=v1
 SECRET_DB_PASSWORD_VERSION=v1
+# Optionally override database name and password
+#DB_NAME=site
+#DB_USER=site
 
 
 # Local SMTP relay
@@ -33,6 +38,5 @@ SECRET_DB_PASSWORD_VERSION=v1
 #SMTP_TLS=on
 #SECRET_SMTP_PASSWORD_VERSION=v1
 
-
 # Use httpd instead of nginx
 #COMPOSE_FILE="$COMPOSE_FILE:compose.httpd.yml"

compose.mariadb.yml

@@ -4,9 +4,9 @@ services:
     environment:
       - DB_HOST=${STACK_NAME}_db
       # - DB_HOST=db
-      - DB_USER=site
+      - DB_USER=${DB_USER:-site}
       - DB_PASSWORD_FILE=/run/secrets/db_password
-      - DB_NAME=site
+      - DB_NAME=${DB_NAME:-site}
     secrets:
       - db_password
     depends_on:
@@ -19,8 +19,8 @@ services:
       - backend
     environment:
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
-      - MYSQL_DATABASE=site
+      - MYSQL_DATABASE=${DB_NAME:-site}
-      - MYSQL_USER=site
+      - MYSQL_USER=${DB_USER:-site}
       - MYSQL_PASSWORD_FILE=/run/secrets/db_password
     secrets:
       - db_password

entrypoint.sh.tmpl

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+{{ if (env "INSTALL_XSL") }}
+apk add libxslt-dev
+{{ end }}
+
 {{ if (env "PHP_EXTENSIONS") }}
 echo Installing PHP extensions: {{ env "PHP_EXTENSIONS" }}
 docker-php-ext-install {{ env "PHP_EXTENSIONS" }}
@@ -7,4 +11,4 @@ docker-php-ext-install {{ env "PHP_EXTENSIONS" }}
 
 exec "$@"
 
-php-fpm
+php-fpm