From 5001a9e2ccb128a0416902117034eca880a74b07 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Vanhalle Date: Sun, 11 Apr 2021 22:31:54 +0200 Subject: [PATCH] switches to sh instead of bash --- create.sh | 107 ++++++++++++++++++++++++++++++++---------------------- mnt.sh | 49 ++++++++++++++++++------- purge.sh | 8 ++-- root.sh | 20 +++++++--- wp.sh | 20 +++++++--- 5 files changed, 132 insertions(+), 72 deletions(-) diff --git a/create.sh b/create.sh index c812f25..dce5de6 100755 --- a/create.sh +++ b/create.sh @@ -1,73 +1,92 @@ -#! /bin/bash +#! /bin/sh # -set -o allexport; -source .env; -set +o allexport +if [ -f .env ] +then + set -o allexport; + . ./.env; + set +o allexport +else + echo Missing .env file + exit 1 +fi -echo "Setting up docker volumes"; -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 $DOCKER_PREFIX; +echo Setting up ${DOCKER_PREFIX} volumes +docker volume create ${DOCKER_PREFIX}-web +docker volume create ${DOCKER_PREFIX}-db +docker volume create wp-cli-cache +echo Setting up ${DOCKER_PREFIX} network +docker network create ${DOCKER_PREFIX} -docker-compose up -d web; -while ! docker ps -q -f name=$DOCKER_PREFIX-web; do - echo "Waiting for the web container to be up and running..."; - sleep 1; +docker-compose up -d web +while [ ! $(docker ps --quiet --filter name=${DOCKER_PREFIX}-web) ] +do + echo Waiting for the ${DOCKER_PREFIX}-web container to be up and running… + sleep 1 done -docker-compose up -d db; -while ! docker ps -q -f name=$DOCKER_PREFIX-db; do - echo "Waiting for the db container to be up and running..."; - sleep 1; +docker-compose up -d db +while [ ! $(docker ps -q -f name=${DOCKER_PREFIX}-db) ] +do + echo Waiting for the ${DOCKER_PREFIX}-db container to be up and running… + sleep 1 done -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; +COMMAND="mysqladmin \ + ping \ + --host ${DOCKER_PREFIX}-db \ + --port 3306 \ + --protocol=tcp \ + --user=${DB_USER} \ + --password=${DB_USER_PASSWORD} \ + --silent" +# weird [: mysqld: unexpected operator when using COMMAND +#while ! docker exec ${DOCKER_PREFIX}-web /bin/sh -c "mysqladmin ping -h ${DOCKER_PREFIX}-db -P 3306 --protocol=tcp -u user -puser --silent" +while [ ! $(docker exec ${DOCKER_PREFIX}-web /bin/sh -c "${COMMAND}") ] +do + echo Waiting for ${DOCKER_PREFIX}-db to accept connections… + sleep 1 done -echo "Downloading WordPress core"; -docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " +echo Downloading WordPress core +docker exec --user www-data ${DOCKER_PREFIX}-web /bin/sh -c " wp core download \ - --locale=$WP_LOCALE \ + --locale=${WP_LOCALE} \ --path=/var/www/html \ - --version=$WP_VERSION"; + --version=${WP_VERSION}" -echo "Creating WordPress config"; -docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c ' +echo Creating ${DOCKER_PREFIX} WordPress config +docker exec --user www-data ${DOCKER_PREFIX}-web /bin/sh -c ' wp config create \ - --dbhost='"$DOCKER_PREFIX-db"' \ - --dbname='"$DOCKER_PREFIX"' \ - --dbpass='"$DB_USER_PASSWORD"' \ - --dbuser='"$DB_USER"' \ + --dbhost='"${DOCKER_PREFIX}-db"' \ + --dbname='"${DOCKER_PREFIX}"' \ + --dbpass='"${DB_USER_PASSWORD}"' \ + --dbuser='"${DB_USER}"' \ --force \ --path=/var/www/html \ --skip-check \ --extra-php <