Commit a58d6063 authored by Chris Shantz's avatar Chris Shantz

Merge branch 'wcms-2.x' of https://git.uwaterloo.ca/wcms/wcms-docker into wcms-2.x

parents 0af0821e b3f40ffd
......@@ -216,3 +216,23 @@ in the volumes. This means that you will need to clean out local site module fol
delete the content of the `_local` folders and start fresh.
For Patternlab in Drupal 8, you can access it (once you have Patternlab built) at https://localhost:4446/uw_wcms_pattern_lab/pattern-lab/public/
## Xdebug and PHPStorm
Xdebug is installed as part of the containers, the only setup that should need to be done is in PHPStorm.
** Note ** these instructions are still a work in progress, some additional steps may be required to get xdebug working in PHPStorm.
Open PHPStorm, go to:
`File -> Settings -> PHP -> Debug`
Set the debug port to the port indicated in the xdebug settings in the dockerfile (which is currently 9011).
Then, in the Top right corner you will see:
`Run / Debug Configurations`
You will need to create a PHP Remote Debug profile (from the template) and name it something simple, such as 'xdebug' or "WCMS xdebug'.
To start listening, enable the IDE to listen to the port, set breakpoints and run the 'xdebug' profile debug.
......@@ -4,7 +4,7 @@
############################################################
# Set the base image to Ubuntu
FROM php:7.2-apache
FROM php:7.2-apache-stretch
# Added so we can install 6.x branch of nodejs.
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
......
......@@ -4,7 +4,7 @@
############################################################
## Set the base image to Ubuntu
FROM php:7.2-apache
FROM php:7.2-apache-stretch
## Pass the argument variables from the docker-compose file to the Dockerfile and echo them out
ARG PHP_VERSION8
......
......@@ -89,7 +89,7 @@ mkdir /var/www/drupal8/sites/wcms8.fdsu5/modules
cp /var/www/wcms-settings/settings.php /var/www/drupal8/sites/wcms8.fdsu5/settings.php
## Change sitename to match site
cd /var/www/drupal8/sites/wcms8.fdsu4
cd /var/www/drupal8/sites/wcms8.fdsu5
sed -i 's/fdsu1/fdsu5/g' settings.php
## Create config and sync directories
......@@ -152,7 +152,7 @@ mkdir /var/www/drupal8alt/sites/wcms8alt.fdsu2/modules
## Create settings.php file
cp /var/www/wcms-settings/settings.php /var/www/drupal8alt/sites/wcms8alt.fdsu2/settings.php
cd /var/www/drupal8alt/sites/wcms8alt.fdsu1
cd /var/www/drupal8alt/sites/wcms8alt.fdsu2
sed -i 's/wcms8/wcms8alt/g' settings.php
## Change sitename to match site
......@@ -167,7 +167,7 @@ mkdir /var/www/drupal8alt/sites/wcms8alt.fdsu3/modules
## Create settings.php file
cp /var/www/wcms-settings/settings.php /var/www/drupal8alt/sites/wcms8alt.fdsu3/settings.php
cd /var/www/drupal8alt/sites/wcms8alt.fdsu1
cd /var/www/drupal8alt/sites/wcms8alt.fdsu3
sed -i 's/wcms8/wcms8alt/g' settings.php
## Change sitename to match site
......@@ -182,7 +182,7 @@ mkdir /var/www/drupal8alt/sites/wcms8alt.fdsu4/modules
## Create settings.php file
cp /var/www/wcms-settings/settings.php /var/www/drupal8alt/sites/wcms8alt.fdsu4/settings.php
cd /var/www/drupal8alt/sites/wcms8alt.fdsu1
cd /var/www/drupal8alt/sites/wcms8alt.fdsu4
sed -i 's/wcms8/wcms8alt/g' settings.php
## Change sitename to match site
......@@ -197,12 +197,12 @@ mkdir /var/www/drupal8alt/sites/wcms8alt.fdsu5/modules
## Create settings.php file
cp /var/www/wcms-settings/settings.php /var/www/drupal8alt/sites/wcms8alt.fdsu5/settings.php
cd /var/www/drupal8alt/sites/wcms8alt.fdsu1
cd /var/www/drupal8alt/sites/wcms8alt.fdsu5
sed -i 's/wcms8/wcms8alt/g' settings.php
## Change sitename to match site
cd /var/www/drupal8alt/sites/wcms8alt.fdsu4
sed -i 's/fdsu1/fdsu4/g' settings.php
cd /var/www/drupal8alt/sites/wcms8alt.fdsu5
sed -i 's/fdsu1/fdsu5/g' settings.php
## Create config and sync directories
mkdir /var/www/drupal8alt/sites/wcms8alt.fdsu1/files/config_acqTmp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment