From 129dd9d29905af503de01d5679070c672d1bf4f5 Mon Sep 17 00:00:00 2001 From: ket4yii Date: Sun, 5 Feb 2017 16:26:51 +0300 Subject: [PATCH] Change phpcensor init command. Add admin specifying feature. --- Dockerfile | 3 +++ README.md | 6 ++++++ entrypoint.sh | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5e1b95e..1ecde4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,9 @@ ADD entrypoint.sh / ADD config.tmpl.yml / ADD nginx.conf /etc/nginx/nginx.conf +ENV ADMIN_NAME=admin +ENV ADMIN_EMAIL=admin@php-censor.local +ENV ADMIN_PASSWORD=admin ENV DB_HOST=localhost ENV DB_TYPE=mysql ENV DB_NAME=phpcensor diff --git a/README.md b/README.md index fb1ea31..abb08bd 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,12 @@ php-censor: ``` +And specify admin user by these variables: + +* ADMIN_NAME (**default: admin**) +* ADMIN_PASSWORD (**default: admin**) +* ADMIN_EMAIL (**default: admin@php-censor.local**) + ### Docker compose In progress diff --git a/entrypoint.sh b/entrypoint.sh index 306c840..ec8e5c7 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,6 +5,6 @@ export LOCAL_DB_HOST=$(echo $DB_HOST | awk -F ":" '{ print $1 }') export LOCAL_DB_PORT=$(echo $DB_HOST | awk -F ":" '{ print $2; }') [ ! -f ./app/config.yml ] && envsubst < /config.tmpl.yml > ./app/config.yml -./bin/console php-censor:migrate +./bin/console php-censor:install --config-from-file=yes --admin-name=$ADMIN_NAME --admin-password=$ADMIN_PASSWORD --admin-email=$ADMIN_EMAIL nginx php-fpm