From a4f4bd6ff3d0d44345061d400a5e77928fe3b031 Mon Sep 17 00:00:00 2001
From: mnshantz <mnshantz@uwaterloo.ca>
Date: Wed, 13 Feb 2019 16:29:30 -0500
Subject: [PATCH] More changes to entry-point so routing works correctly...
---
build-scripts/drupal7/docker-entrypoint-d7.sh | 2 +-
build-scripts/wcms7.2/docker-entrypoint-p72.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build-scripts/drupal7/docker-entrypoint-d7.sh b/build-scripts/drupal7/docker-entrypoint-d7.sh
index 17766a0..9255d4b 100644
--- a/build-scripts/drupal7/docker-entrypoint-d7.sh
+++ b/build-scripts/drupal7/docker-entrypoint-d7.sh
@@ -18,7 +18,7 @@ if [ -n "$APACHE_DOCROOT_DIR" ]; then
fi
# Allow the site name to be overriden.
-APACHE_SITE_NAME="${APACHE_SITE_NAME:-docker}"
+APACHE_SITE_NAME="${APACHE_SITE_NAME:-wcms-docker}"
if [ -n "$APACHE_SITE_NAME" ]; then
sed -i 's@^\s*ServerName.*@'" ServerName ${APACHE_SITE_NAME}"'@' /etc/apache2/sites-available/000-default.conf
fi
diff --git a/build-scripts/wcms7.2/docker-entrypoint-p72.sh b/build-scripts/wcms7.2/docker-entrypoint-p72.sh
index 17766a0..9255d4b 100644
--- a/build-scripts/wcms7.2/docker-entrypoint-p72.sh
+++ b/build-scripts/wcms7.2/docker-entrypoint-p72.sh
@@ -18,7 +18,7 @@ if [ -n "$APACHE_DOCROOT_DIR" ]; then
fi
# Allow the site name to be overriden.
-APACHE_SITE_NAME="${APACHE_SITE_NAME:-docker}"
+APACHE_SITE_NAME="${APACHE_SITE_NAME:-wcms-docker}"
if [ -n "$APACHE_SITE_NAME" ]; then
sed -i 's@^\s*ServerName.*@'" ServerName ${APACHE_SITE_NAME}"'@' /etc/apache2/sites-available/000-default.conf
fi
--
GitLab