diff --git a/.env-example b/.env-example index 3606ea1..8a33f81 100644 --- a/.env-example +++ b/.env-example @@ -1,11 +1,12 @@ DB_ROOT_PASSWORD=root DB_USER=user DB_USER_PASSWORD=user -DOCKER_PREFIX=wptest -MOUNT_USER=whoami +DOCKER_PREFIX= +MOUNT_USER= WP_ADMIN_PASSWORD=admin WP_ADMIN_USERNAME=admin +WP_DEFAULT_PROTOCOL=https WP_LOCALE=fr_FR WP_THEME=twentyseventeen -WP_URL=https://www.wptest.localhost +WP_URL= WP_VERSION=5.4 diff --git a/create.sh b/create.sh index dc39fca..e8ef798 100755 --- a/create.sh +++ b/create.sh @@ -60,7 +60,7 @@ docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " --path=/var/www/html \ --skip-email \ --title=$DOCKER_PREFIX \ - --url=https://$WP_URL"; + --url=$WP_DEFAULT_PROTOCOL://$WP_URL"; echo "Installing WordPress $WP_THEME theme"; docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " diff --git a/root.sh b/root.sh index 8f5e638..bf23d95 100755 --- a/root.sh +++ b/root.sh @@ -5,4 +5,4 @@ set -o allexport; source .env; set +o allexport -docker exec -it --user root $PREFIX-web /bin/bash +docker exec -it --user root $DOCKER_PREFIX-web /bin/bash diff --git a/wp.sh b/wp.sh index dad4ed4..6afab56 100755 --- a/wp.sh +++ b/wp.sh @@ -5,4 +5,4 @@ set -o allexport; source .env; set +o allexport -docker exec -it --user www-data $PREFIX-web /bin/bash +docker exec -it --user www-data $DOCKER_PREFIX-web /bin/bash