From de09cdbeb04a42fbf2b746e4a5a375643749817e Mon Sep 17 00:00:00 2001 From: Jean-Christophe Vanhalle Date: Mon, 4 May 2020 13:27:53 +0200 Subject: [PATCH] adds more env variables --- .env-example | 9 ++++++--- create.sh | 36 ++++++++++++++++++------------------ mnt.sh | 8 ++++---- purge.sh | 12 ++++++------ 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.env-example b/.env-example index a12dc8e..3606ea1 100644 --- a/.env-example +++ b/.env-example @@ -1,8 +1,11 @@ -PREFIX=wptest DB_ROOT_PASSWORD=root DB_USER=user DB_USER_PASSWORD=user -THEME=twentyseventeen +DOCKER_PREFIX=wptest +MOUNT_USER=whoami +WP_ADMIN_PASSWORD=admin +WP_ADMIN_USERNAME=admin WP_LOCALE=fr_FR +WP_THEME=twentyseventeen +WP_URL=https://www.wptest.localhost WP_VERSION=5.4 -USER= diff --git a/create.sh b/create.sh index 4e08f86..d217e12 100755 --- a/create.sh +++ b/create.sh @@ -6,41 +6,41 @@ source .env; set +o allexport echo "Setting up docker volumes"; -docker volume create $PREFIX-web; -docker volume create $PREFIX-db; +docker volume create $DOCKER_PREFIX-web; +docker volume create $DOCKER_PREFIX-db; docker volume create wp-cli-cache; echo "Setting up docker network"; -docker network create $PREFIX; +docker network create $DOCKER_PREFIX; docker-compose up -d web; -while ! docker ps -q -f name=$PREFIX-web; do +while ! docker ps -q -f name=$DOCKER_PREFIX-web; do echo "Waiting for the web container to be up and running..."; sleep 1; done docker-compose up -d db; -while ! docker ps -q -f name=$PREFIX-db; do +while ! docker ps -q -f name=$DOCKER_PREFIX-db; do echo "Waiting for the db container to be up and running..."; sleep 1; done -while ! docker exec $PREFIX-web /bin/sh -c "mysqladmin ping -h $PREFIX-db -P 3306 --protocol=tcp -u user -puser --silent" ; do +while ! docker exec $DOCKER_PREFIX-web /bin/sh -c "mysqladmin ping -h $DOCKER_PREFIX-db -P 3306 --protocol=tcp -u user -puser --silent" ; do echo "Waiting for the mysql server in the db container to be up and running..."; sleep 1; done echo "Downloading WordPress core"; -docker exec --user www-data $PREFIX-web /bin/sh -c " +docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " wp core download \ --locale=$WP_LOCALE \ --path=/var/www/html \ --version=$WP_VERSION"; echo "Creating WordPress config"; -docker exec --user www-data $PREFIX-web /bin/sh -c ' +docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c ' wp config create \ - --dbhost='"$PREFIX-db"' \ - --dbname='"$PREFIX"' \ + --dbhost='"$DOCKER_PREFIX-db"' \ + --dbname='"$DOCKER_PREFIX"' \ --dbpass='"$DB_USER_PASSWORD"' \ --dbuser='"$DB_USER"' \ --force \ @@ -52,21 +52,21 @@ EXTRA-PHP '; echo "Installing WordPress core"; -docker exec --user www-data $PREFIX-web /bin/sh -c " +docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " wp core install \ --admin_email=no@mail.com \ - --admin_password=admin \ - --admin_user=admin \ + --admin_password=$WP_ADMIN_PASSWORD \ + --admin_user=$WP_ADMIN_USERNAME \ --path=/var/www/html \ --skip-email \ - --title=$PREFIX \ - --url=https://www.$PREFIX.localhost"; + --title=$DOCKER_PREFIX \ + --url=$WP_URL"; -echo "Installing WordPress $THEME theme"; -docker exec --user www-data $PREFIX-web /bin/sh -c " +echo "Installing WordPress $WP_THEME theme"; +docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " wp theme install $THEME \ --activate \ --path=/var/www/html"; echo "Connect network to traefik"; -docker network connect $PREFIX traefik; +docker network connect $DOCKER_PREFIX traefik; diff --git a/mnt.sh b/mnt.sh index 01dad84..3a96a5f 100755 --- a/mnt.sh +++ b/mnt.sh @@ -5,16 +5,16 @@ set -o allexport; source ./.env; set +o allexport -docker_volumes_path=/home/$USER/.docker-data/volumes # volume_path=/var/lib/docker/volumes -volume_src_path=$docker_volumes_path/$PREFIX-web/_data +docker_volumes_path=/home/$MOUNT_USER/.docker-data/volumes # volume_path=/var/lib/docker/volumes +volume_src_path=$docker_volumes_path/$DOCKER_PREFIX-web/_data volume_dest_path=$PWD/volume if [ ! -d ./volume ]; then - sudo -u $USER mkdir volume + sudo -u $MOUNT_USER mkdir volume fi if [ -d ./volume ]; then if [ ! "$(ls -A ./volume)" ]; then - /usr/bin/bindfs --force-user=$USER --force-group=$USER --create-for-user=www-data --create-for-group=www-data $volume_src_path $volume_dest_path + /usr/bin/bindfs --force-user=$MOUNT_USER --force-group=$MOUNT_USER --create-for-user=www-data --create-for-group=www-data $volume_src_path $volume_dest_path fi fi diff --git a/purge.sh b/purge.sh index cef4af6..3d9ad24 100755 --- a/purge.sh +++ b/purge.sh @@ -6,9 +6,9 @@ source .env; set +o allexport docker-compose stop -docker network disconnect $PREFIX traefik -docker network rm $PREFIX -docker rm $PREFIX-web -docker rm $PREFIX-db -docker volume rm $PREFIX-web -docker volume rm $PREFIX-db +docker network disconnect $DOCKER_PREFIX traefik +docker network rm $DOCKER_PREFIX +docker rm $DOCKER_PREFIX-web +docker rm $DOCKER_PREFIX-db +docker volume rm $DOCKER_PREFIX-web +docker volume rm $DOCKER_PREFIX-db