Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bin: Correctly handle spaces in basedir and other refinements. #153

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bin: Correctly handle spaces in basedir and other refinements. #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions bin/moodle-docker-compose
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ set -e

if [ ! -d "$MOODLE_DOCKER_WWWROOT" ];
then
echo 'Error: $MOODLE_DOCKER_WWWROOT is not set or not an existing directory'
echo 'Error: MOODLE_DOCKER_WWWROOT is not set or not an existing directory'
exit 1
fi

if [ -z "$MOODLE_DOCKER_DB" ];
then
echo 'Error: $MOODLE_DOCKER_DB is not set'
echo 'Error: MOODLE_DOCKER_DB is not set'
exit 1
fi

Expand All @@ -25,29 +25,28 @@ basedir="$( cd -P "$( dirname "$SOURCE" )/../" && pwd )"
export ASSETDIR="${basedir}/assets"


dockercompose="docker-compose -f ${basedir}/base.yml"
dockercompose="${dockercompose} -f ${basedir}/service.mail.yml"
dockercompose_cmd=("docker-compose" "-f" "${basedir}/base.yml")
dockercompose_cmd+=("-f" "${basedir}/service.mail.yml")

# PHP Version.
export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-7.3}

# Database flavour
if [ "$MOODLE_DOCKER_DB" != 'pgsql' ];
then
dockercompose="${dockercompose} -f ${basedir}/db.${MOODLE_DOCKER_DB}.yml"

dockercompose_cmd+=("-f" "${basedir}/db.${MOODLE_DOCKER_DB}.yml")
fi

# Support PHP version overrides for DB..
filename="${basedir}/db.${MOODLE_DOCKER_DB}.${MOODLE_DOCKER_PHP_VERSION}.yml"
if [ -f $filename ]; then
dockercompose="${dockercompose} -f ${filename}"
if [ -f "$filename" ]; then
dockercompose_cmd+=("-f" "${filename}")
fi

# Mobile app deprecated variables
if [ ! -z "$MOODLE_APP_VERSION" ];
if [ -n "$MOODLE_APP_VERSION" ];
then
echo 'Warning: $MOODLE_APP_VERSION is deprecated, use $MOODLE_DOCKER_APP_VERSION instead'
echo 'Warning: MOODLE_APP_VERSION is deprecated, use MOODLE_DOCKER_APP_VERSION instead'

if [ -z "$MOODLE_DOCKER_APP_VERSION" ];
then
Expand All @@ -56,61 +55,62 @@ then
fi

# Mobile app for development
if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" == "chrome" ]] && [[ ! -z "$MOODLE_DOCKER_APP_PATH" ]];
if [[ -n "$MOODLE_DOCKER_BROWSER" && "$MOODLE_DOCKER_BROWSER" == "chrome" \
&& -n "$MOODLE_DOCKER_APP_PATH" ]];
then
dockercompose="${dockercompose} -f ${basedir}/moodle-app-dev.yml"
dockercompose_cmd+=("-f" "${basedir}/moodle-app-dev.yml")
# Mobile app using a docker image
elif [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" == "chrome" ]] && [[ ! -z "$MOODLE_DOCKER_APP_VERSION" ]];
elif [[ -n "$MOODLE_DOCKER_BROWSER" && "$MOODLE_DOCKER_BROWSER" == "chrome" \
&& -n "$MOODLE_DOCKER_APP_VERSION" ]];
then
dockercompose="${dockercompose} -f ${basedir}/moodle-app.yml"
dockercompose_cmd+=("-f" "${basedir}/moodle-app.yml")
fi

# Selenium browser
if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" != "firefox" ]];
if [[ -n "$MOODLE_DOCKER_BROWSER" && "$MOODLE_DOCKER_BROWSER" != "firefox" ]];
then
dockercompose="${dockercompose} -f ${basedir}/selenium.${MOODLE_DOCKER_BROWSER}.yml"
dockercompose_cmd+=("-f" "${basedir}/selenium.${MOODLE_DOCKER_BROWSER}.yml")
fi

# Selenium VNC port
export MOODLE_DOCKER_SELENIUM_SUFFIX=""
if [[ $MOODLE_DOCKER_SELENIUM_VNC_PORT == *":"* ]] || [[ $MOODLE_DOCKER_SELENIUM_VNC_PORT -gt 0 ]]
if [[ $MOODLE_DOCKER_SELENIUM_VNC_PORT == *":"* || $MOODLE_DOCKER_SELENIUM_VNC_PORT -gt 0 ]]
then
export MOODLE_DOCKER_SELENIUM_SUFFIX="-debug"
# If no bind ip has been configured (bind_ip:port), default to 127.0.0.1
if [[ ! $MOODLE_DOCKER_SELENIUM_VNC_PORT == *":"* ]]
then
MOODLE_DOCKER_SELENIUM_VNC_PORT=127.0.0.1:$MOODLE_DOCKER_SELENIUM_VNC_PORT
fi
dockercompose="${dockercompose} -f ${basedir}/selenium.debug.yml"
dockercompose_cmd+=("-f" "${basedir}/selenium.debug.yml")
fi

# External services
if [[ ! -z "$MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES" ]];
if [[ -n "$MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES" ]];
then
dockercompose="${dockercompose} -f ${basedir}/phpunit-external-services.yml"
dockercompose_cmd+=("-f" "${basedir}/phpunit-external-services.yml")
fi

# Webserver host
export MOODLE_DOCKER_WEB_HOST=${MOODLE_DOCKER_WEB_HOST:-localhost}

# Webserver port
export MOODLE_DOCKER_WEB_PORT=${MOODLE_DOCKER_WEB_PORT:-8000}
if [[ $MOODLE_DOCKER_WEB_PORT == *":"* ]] || [[ $MOODLE_DOCKER_WEB_PORT -gt 0 ]]
if [[ $MOODLE_DOCKER_WEB_PORT == *":"* || $MOODLE_DOCKER_WEB_PORT -gt 0 ]]
then
# If no bind ip has been configured (bind_ip:port), default to 127.0.0.1
if [[ ! $MOODLE_DOCKER_WEB_PORT == *":"* ]]
if [[ $MOODLE_DOCKER_WEB_PORT != *":"* ]]
then
MOODLE_DOCKER_WEB_PORT=127.0.0.1:$MOODLE_DOCKER_WEB_PORT
fi
dockercompose="${dockercompose} -f ${basedir}/webserver.port.yml"
dockercompose_cmd+=("-f" "${basedir}/webserver.port.yml")
fi


# Mac OS Compatbility
if [[ "$(uname)" == "Darwin" ]]; then
# Support https://docs.docker.com/docker-for-mac/osxfs-caching/
dockercompose="${dockercompose} -f ${basedir}/volumes-cached.yml"
dockercompose_cmd+=("-f" "${basedir}/volumes-cached.yml")
fi


$dockercompose "$@"
"${dockercompose_cmd[@]}" "$@"
6 changes: 4 additions & 2 deletions bin/moodle-docker-wait-for-app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ set -e

basedir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"

if [[ ! -z "$MOODLE_DOCKER_BROWSER" ]] && [[ "$MOODLE_DOCKER_BROWSER" == "chrome" ]] && ([[ ! -z "$MOODLE_DOCKER_APP_PATH" ]] || [[ ! -z "$MOODLE_DOCKER_APP_VERSION" ]] || [[ ! -z "$MOODLE_APP_VERSION" ]]);
if [[ -n "$MOODLE_DOCKER_BROWSER" && "$MOODLE_DOCKER_BROWSER" == "chrome" ]] \
&& [[ -n "$MOODLE_DOCKER_APP_PATH" || -n "$MOODLE_DOCKER_APP_VERSION" \
|| -n "$MOODLE_APP_VERSION" ]];
then
until $basedir/bin/moodle-docker-compose logs moodleapp | grep -q 'dev server running: ';
until "$basedir"/bin/moodle-docker-compose logs moodleapp | grep -q 'dev server running: ';
do
echo 'Waiting for Moodle app to come up...'
sleep 15
Expand Down
6 changes: 3 additions & 3 deletions bin/moodle-docker-wait-for-db
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ basedir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"

if [ -z "$MOODLE_DOCKER_DB" ];
then
echo 'Error: $MOODLE_DOCKER_DB is not set'
echo 'Error: MOODLE_DOCKER_DB is not set'
exit 1
fi

if [ "$MOODLE_DOCKER_DB" = "mssql" ];
then
$basedir/bin/moodle-docker-compose exec -T db /wait-for-mssql-to-come-up.sh
"$basedir"/bin/moodle-docker-compose exec -T db /wait-for-mssql-to-come-up.sh
elif [ "$MOODLE_DOCKER_DB" = "oracle" ];
then
until $basedir/bin/moodle-docker-compose logs db | grep -q 'Database opened.';
until "$basedir"/bin/moodle-docker-compose logs db | grep -q 'Database opened.';
do
echo 'Waiting for oracle to come up...'
sleep 15
Expand Down