adds protocol env variable and fixes prefix bug

This commit is contained in:
2020-06-09 15:46:44 +02:00
parent ab23a47dee
commit 3b509ed787
4 changed files with 7 additions and 6 deletions

View File

@@ -1,11 +1,12 @@
DB_ROOT_PASSWORD=root DB_ROOT_PASSWORD=root
DB_USER=user DB_USER=user
DB_USER_PASSWORD=user DB_USER_PASSWORD=user
DOCKER_PREFIX=wptest DOCKER_PREFIX=
MOUNT_USER=whoami MOUNT_USER=
WP_ADMIN_PASSWORD=admin WP_ADMIN_PASSWORD=admin
WP_ADMIN_USERNAME=admin WP_ADMIN_USERNAME=admin
WP_DEFAULT_PROTOCOL=https
WP_LOCALE=fr_FR WP_LOCALE=fr_FR
WP_THEME=twentyseventeen WP_THEME=twentyseventeen
WP_URL=https://www.wptest.localhost WP_URL=
WP_VERSION=5.4 WP_VERSION=5.4

View File

@@ -60,7 +60,7 @@ docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c "
--path=/var/www/html \ --path=/var/www/html \
--skip-email \ --skip-email \
--title=$DOCKER_PREFIX \ --title=$DOCKER_PREFIX \
--url=https://$WP_URL"; --url=$WP_DEFAULT_PROTOCOL://$WP_URL";
echo "Installing WordPress $WP_THEME theme"; echo "Installing WordPress $WP_THEME theme";
docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c "

View File

@@ -5,4 +5,4 @@ set -o allexport;
source .env; source .env;
set +o allexport set +o allexport
docker exec -it --user root $PREFIX-web /bin/bash docker exec -it --user root $DOCKER_PREFIX-web /bin/bash

2
wp.sh
View File

@@ -5,4 +5,4 @@ set -o allexport;
source .env; source .env;
set +o allexport set +o allexport
docker exec -it --user www-data $PREFIX-web /bin/bash docker exec -it --user www-data $DOCKER_PREFIX-web /bin/bash