From e1d27b33c184467215940a80146c0d1cd7ee039b Mon Sep 17 00:00:00 2001
From: Chris Shantz <mnshantz@uwaterloo.ca>
Date: Wed, 4 Jul 2018 11:10:49 -0400
Subject: [PATCH] Update docker-entrypoint.sh changing default paths.
---
build-scripts/web/docker-entrypoint.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build-scripts/web/docker-entrypoint.sh b/build-scripts/web/docker-entrypoint.sh
index f56f24a..f671ec3 100644
--- a/build-scripts/web/docker-entrypoint.sh
+++ b/build-scripts/web/docker-entrypoint.sh
@@ -12,19 +12,19 @@ if [ -f /run/apache2/apache2.pid ]; then
fi
# Allow the Apache docroot to be overridden.
-APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/html}"
+APACHE_DOCROOT_DIR="${APACHE_DOCROOT_DIR:-/var/www/drupal}"
if [ -n "$APACHE_DOCROOT_DIR" ]; then
sed -i 's@^\s*DocumentRoot.*@'" DocumentRoot ${APACHE_DOCROOT_DIR}"'@' /etc/apache2/sites-available/000-default.conf
fi
# Allow the site name to be overriden.
-APACHE_SITE_NAME="${APACHE_SITE_NAME:-docker.test}"
+APACHE_SITE_NAME="${APACHE_SITE_NAME:-docker8}"
if [ -n "$APACHE_SITE_NAME" ]; then
sed -i 's@^\s*ServerName.*@'" ServerName ${APACHE_SITE_NAME}"'@' /etc/apache2/sites-available/000-default.conf
fi
# Allow for site aliases to be provided.
-APACHE_SITE_ALIAS="${APACHE_SITE_ALIAS:-docker.localhost}"
+APACHE_SITE_ALIAS="${APACHE_SITE_ALIAS:-docker8.localhost}"
if [ -n "$APACHE_SITE_ALIAS" ]; then
sed -i 's@^\s*ServerAlias.*@'" ServerAlias ${APACHE_SITE_ALIAS}"'@' /etc/apache2/sites-available/000-default.conf
fi
--
GitLab