diff --git a/.env.sample b/.env.sample index 4d20287..485cbfb 100644 --- a/.env.sample +++ b/.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" diff --git a/compose.mariadb.yml b/compose.mariadb.yml index b38f53a..8a73d1e 100644 --- a/compose.mariadb.yml +++ b/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_USER=site + - MYSQL_DATABASE=${DB_NAME:-site} + - MYSQL_USER=${DB_USER:-site} - MYSQL_PASSWORD_FILE=/run/secrets/db_password secrets: - db_password diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index b1ef2ac..c161c0a 100644 --- a/entrypoint.sh.tmpl +++ b/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 \ No newline at end of file +php-fpm