Make docker log error to the screen and support alternate server names.

tripal · Apr 11, 2023 · 6990438 · 6990438
1 parent 58bee55
commit 6990438
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tripaldocker/Dockerfile-php8-pgsql13 b/tripaldocker/Dockerfile-php8-pgsql13
@@ -205,10 +205,11 @@ RUN service apache2 start \
 ## Configuration files & Activation script
 RUN mv /app/tripaldocker/init_scripts/supervisord.conf /etc/supervisord.conf \
   && mv /app/tripaldocker/default_files/000-default.conf /etc/apache2/sites-available/000-default.conf \
-  && echo "\$settings['trusted_host_patterns'] = [ '^localhost$', '^127\.0\.0\.1$' ];" >> /var/www/drupal9/web/sites/default/settings.php \
+  && echo "\$settings['trusted_host_patterns'] = [ '^localhost$', '^127\.0\.0\.1$', '\$_SERVER[\'SERVER_NAME\']' ];" >> /var/www/drupal9/web/sites/default/settings.php \
   && mv /app/tripaldocker/init_scripts/init.sh /usr/bin/init.sh \
   && chmod +x /usr/bin/init.sh \
-  && mv /app/tripaldocker/default_files/xdebug/xdebug_toggle.sh /usr/bin/xdebug_toggle.sh
+  && mv /app/tripaldocker/default_files/xdebug/xdebug_toggle.sh /usr/bin/xdebug_toggle.sh \
+  && echo "\$config['system.logging']['error_level'] = 'verbose';" >> /var/www/drupal9/web/sites/default/settings.php 
 
 ## Make global commands.
 RUN ln -s /var/www/drupal9/vendor/phpunit/phpunit/phpunit /usr/local/bin/ \

diff --git a/tripaldocker/Dockerfile-php8.1-pgsql13 b/tripaldocker/Dockerfile-php8.1-pgsql13
@@ -205,10 +205,11 @@ RUN service apache2 start \
 ## Configuration files & Activation script
 RUN mv /app/tripaldocker/init_scripts/supervisord.conf /etc/supervisord.conf \
   && mv /app/tripaldocker/default_files/000-default.conf /etc/apache2/sites-available/000-default.conf \
-  && echo "\$settings['trusted_host_patterns'] = [ '^localhost$', '^127\.0\.0\.1$' ];" >> /var/www/drupal9/web/sites/default/settings.php \
+  && echo "\$settings['trusted_host_patterns'] = [ '^localhost$', '^127\.0\.0\.1$', '\$_SERVER[\'SERVER_NAME\']' ];" >> /var/www/drupal9/web/sites/default/settings.php \
   && mv /app/tripaldocker/init_scripts/init.sh /usr/bin/init.sh \
   && chmod +x /usr/bin/init.sh \
-  && mv /app/tripaldocker/default_files/xdebug/xdebug_toggle.sh /usr/bin/xdebug_toggle.sh
+  && mv /app/tripaldocker/default_files/xdebug/xdebug_toggle.sh /usr/bin/xdebug_toggle.sh \
+  && echo "\$config['system.logging']['error_level'] = 'verbose';" >> /var/www/drupal9/web/sites/default/settings.php 
 
 ## Make global commands.
 RUN ln -s /var/www/drupal9/vendor/phpunit/phpunit/phpunit /usr/local/bin/ \
@@ -221,3 +222,4 @@ WORKDIR /var/www/drupal9/web
 EXPOSE 80 5432 9003
 
 ENTRYPOINT ["init.sh"]
+