From 9ba38d169fb11e0657b6eb44d4bb08541f79c0b4 Mon Sep 17 00:00:00 2001
From: mnshantz <mnshantz@uwaterloo.ca>
Date: Mon, 11 Feb 2019 09:53:43 -0500
Subject: [PATCH] Renames wcms7.1 to 7.2
---
.env | 6 +++---
build-scripts/{wcms7.1 => wcms7.2}/000-default.conf | 0
build-scripts/{wcms7.1 => wcms7.2}/Dockerfile | 6 +++---
.../docker-entrypoint-p72.sh} | 0
build-scripts/{wcms7.1 => wcms7.2}/php.ini | 0
build-scripts/{wcms7.1 => wcms7.2}/servername.conf | 0
build-scripts/{wcms7.1 => wcms7.2}/settings.conf | 2 +-
docker-compose.yml | 6 +++---
8 files changed, 10 insertions(+), 10 deletions(-)
rename build-scripts/{wcms7.1 => wcms7.2}/000-default.conf (100%)
rename build-scripts/{wcms7.1 => wcms7.2}/Dockerfile (98%)
rename build-scripts/{wcms7.1/docker-entrypoint-p71.sh => wcms7.2/docker-entrypoint-p72.sh} (100%)
rename build-scripts/{wcms7.1 => wcms7.2}/php.ini (100%)
rename build-scripts/{wcms7.1 => wcms7.2}/servername.conf (100%)
rename build-scripts/{wcms7.1 => wcms7.2}/settings.conf (97%)
diff --git a/.env b/.env
index 10585c1..fbfa041 100644
--- a/.env
+++ b/.env
@@ -22,7 +22,7 @@ DB_PASSWORD=vagrant
DB_ROOT_PASSWORD=root
DB_HOST=mariadb
DB_DRIVER=mysql
-DB_ADDITIONAL=d7_fdsu1 d7_fdsu2 d7_fdsu3 d7_fdsu4 d8_fdsu2 d8_fdsu3 d8_fdsu4 d71_fdsu1 d71_fdsu2 d71_fdsu3 d71_fdsu4 d7os_fdsu1 d7os_fdsu2 d7os_fdsu3 d7os_fdsu4
+DB_ADDITIONAL=d7_fdsu1 d7_fdsu2 d7_fdsu3 d7_fdsu4 d8_fdsu2 d8_fdsu3 d8_fdsu4 d72_fdsu1 d72_fdsu2 d72_fdsu3 d72_fdsu4 d7os_fdsu1 d7os_fdsu2 d7os_fdsu3 d7os_fdsu4
### PHP Setttings ###
@@ -34,8 +34,8 @@ PHP_VERSION=5.6
#PHP_VERSION=7.2
#PHP_VERSION=7.3
-PHP_VERSION_ALT=7.1
-#PHP_VERSION_ALT=7.2
+#PHP_VERSION_ALT=7.1
+PHP_VERSION_ALT=7.2
#PHP_VERSION_ALT=7.3
#PHP_VERSION8=7.1
diff --git a/build-scripts/wcms7.1/000-default.conf b/build-scripts/wcms7.2/000-default.conf
similarity index 100%
rename from build-scripts/wcms7.1/000-default.conf
rename to build-scripts/wcms7.2/000-default.conf
diff --git a/build-scripts/wcms7.1/Dockerfile b/build-scripts/wcms7.2/Dockerfile
similarity index 98%
rename from build-scripts/wcms7.1/Dockerfile
rename to build-scripts/wcms7.2/Dockerfile
index 7b5837a..70dafb8 100644
--- a/build-scripts/wcms7.1/Dockerfile
+++ b/build-scripts/wcms7.2/Dockerfile
@@ -195,8 +195,8 @@ RUN chmod -R g+w /var/www/drupal7/profiles/uw_base_profile
## RUN echo "ServerName ${PROJECT_BASE_URL}" >> /etc/apache2/apache2.conf
# Copy our custom entrypoint and make it executable.
-COPY docker-entrypoint-p71.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-entrypoint-p71.sh
+COPY docker-entrypoint-p72.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-entrypoint-p72.sh
## Add Drupal specific changes for PHP to the php.ini files.
RUN sed -i "s/display_errors = .*/display_errors = On/" /etc/php/${PHP_VERSION_ALT}/apache2/php.ini && \
@@ -220,7 +220,7 @@ EXPOSE 80
EXPOSE 443
# Replace the standard entrypoint /bin/sh with our script.
-ENTRYPOINT ["docker-entrypoint-p71.sh"]
+ENTRYPOINT ["docker-entrypoint-p72.sh"]
# If no command is passed to the container, start Apache by default.
CMD ["apachectl", "-D", "FOREGROUND"]
diff --git a/build-scripts/wcms7.1/docker-entrypoint-p71.sh b/build-scripts/wcms7.2/docker-entrypoint-p72.sh
similarity index 100%
rename from build-scripts/wcms7.1/docker-entrypoint-p71.sh
rename to build-scripts/wcms7.2/docker-entrypoint-p72.sh
diff --git a/build-scripts/wcms7.1/php.ini b/build-scripts/wcms7.2/php.ini
similarity index 100%
rename from build-scripts/wcms7.1/php.ini
rename to build-scripts/wcms7.2/php.ini
diff --git a/build-scripts/wcms7.1/servername.conf b/build-scripts/wcms7.2/servername.conf
similarity index 100%
rename from build-scripts/wcms7.1/servername.conf
rename to build-scripts/wcms7.2/servername.conf
diff --git a/build-scripts/wcms7.1/settings.conf b/build-scripts/wcms7.2/settings.conf
similarity index 97%
rename from build-scripts/wcms7.1/settings.conf
rename to build-scripts/wcms7.2/settings.conf
index 35e37e8..1fde89b 100644
--- a/build-scripts/wcms7.1/settings.conf
+++ b/build-scripts/wcms7.2/settings.conf
@@ -5,7 +5,7 @@ $UWhost = 'wcms-docker:4443';
// Path to site root.
$UWpref = 'fdsu1';
// Name of site database.
-$UWdb = 'd71_fdsu1';
+$UWdb = 'd72_fdsu1';
//Username to connect to site database.
$UWuser = 'drupal';
// Password to connect to site database.
diff --git a/docker-compose.yml b/docker-compose.yml
index 55ad44e..c2898d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,10 +17,10 @@ services:
stdin_open: true
tty: true
- wcms7.1:
- container_name: ${PROJECT_NAME}_wcms7.1
+ wcms7.2:
+ container_name: ${PROJECT_NAME}_wcms7.2
build:
- context: ./build-scripts/wcms7.1
+ context: ./build-scripts/wcms7.2
args:
PHP_VERSION_ALT: ${PHP_VERSION_ALT}
DRUPAL7_VERSION: ${DRUPAL7_VERSION}
--
GitLab