Skip to content
Snippets Groups Projects
Commit 9ba38d16 authored by Chris Shantz's avatar Chris Shantz
Browse files

Renames wcms7.1 to 7.2

parent f0223b3b
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,7 @@ DB_PASSWORD=vagrant ...@@ -22,7 +22,7 @@ DB_PASSWORD=vagrant
DB_ROOT_PASSWORD=root DB_ROOT_PASSWORD=root
DB_HOST=mariadb DB_HOST=mariadb
DB_DRIVER=mysql 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 ### ### PHP Setttings ###
...@@ -34,8 +34,8 @@ PHP_VERSION=5.6 ...@@ -34,8 +34,8 @@ PHP_VERSION=5.6
#PHP_VERSION=7.2 #PHP_VERSION=7.2
#PHP_VERSION=7.3 #PHP_VERSION=7.3
PHP_VERSION_ALT=7.1 #PHP_VERSION_ALT=7.1
#PHP_VERSION_ALT=7.2 PHP_VERSION_ALT=7.2
#PHP_VERSION_ALT=7.3 #PHP_VERSION_ALT=7.3
#PHP_VERSION8=7.1 #PHP_VERSION8=7.1
......
...@@ -195,8 +195,8 @@ RUN chmod -R g+w /var/www/drupal7/profiles/uw_base_profile ...@@ -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 ## RUN echo "ServerName ${PROJECT_BASE_URL}" >> /etc/apache2/apache2.conf
# Copy our custom entrypoint and make it executable. # Copy our custom entrypoint and make it executable.
COPY docker-entrypoint-p71.sh /usr/local/bin/ COPY docker-entrypoint-p72.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint-p71.sh RUN chmod +x /usr/local/bin/docker-entrypoint-p72.sh
## Add Drupal specific changes for PHP to the php.ini files. ## 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 && \ RUN sed -i "s/display_errors = .*/display_errors = On/" /etc/php/${PHP_VERSION_ALT}/apache2/php.ini && \
...@@ -220,7 +220,7 @@ EXPOSE 80 ...@@ -220,7 +220,7 @@ EXPOSE 80
EXPOSE 443 EXPOSE 443
# Replace the standard entrypoint /bin/sh with our script. # 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. # If no command is passed to the container, start Apache by default.
CMD ["apachectl", "-D", "FOREGROUND"] CMD ["apachectl", "-D", "FOREGROUND"]
File moved
...@@ -5,7 +5,7 @@ $UWhost = 'wcms-docker:4443'; ...@@ -5,7 +5,7 @@ $UWhost = 'wcms-docker:4443';
// Path to site root. // Path to site root.
$UWpref = 'fdsu1'; $UWpref = 'fdsu1';
// Name of site database. // Name of site database.
$UWdb = 'd71_fdsu1'; $UWdb = 'd72_fdsu1';
//Username to connect to site database. //Username to connect to site database.
$UWuser = 'drupal'; $UWuser = 'drupal';
// Password to connect to site database. // Password to connect to site database.
......
...@@ -17,10 +17,10 @@ services: ...@@ -17,10 +17,10 @@ services:
stdin_open: true stdin_open: true
tty: true tty: true
wcms7.1: wcms7.2:
container_name: ${PROJECT_NAME}_wcms7.1 container_name: ${PROJECT_NAME}_wcms7.2
build: build:
context: ./build-scripts/wcms7.1 context: ./build-scripts/wcms7.2
args: args:
PHP_VERSION_ALT: ${PHP_VERSION_ALT} PHP_VERSION_ALT: ${PHP_VERSION_ALT}
DRUPAL7_VERSION: ${DRUPAL7_VERSION} DRUPAL7_VERSION: ${DRUPAL7_VERSION}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment