Merge pull request #261 from UN-OCHA/develop

Deploy 15-11-2023
UN-OCHA · Nov 14, 2023 · 2406b12 · 2406b12
2 parents 784037f + 62efc2f
commit 2406b12
Show file tree

Hide file tree

Showing 9 changed files with 704 additions and 475 deletions.
diff --git a/.docksal/docksal.env b/.docksal/docksal.env
@@ -12,10 +12,10 @@ DOCKSAL_STACK=default
 # This will prevent images from being updated when Docksal is updated
 #WEB_IMAGE='docksal/web:x.x-apache2.4'
 #DB_IMAGE='docksal/db:x.x-mysql-5.6'
-#CLI_IMAGE='docksal/cli:x.x-php7.1'
+CLI_IMAGE='docksal/cli:php8.2-build'
 
 # Override virtual host (matches project folder name by default)
-VIRTUAL_HOST=odsg8-site.docksal
+# VIRTUAL_HOST=odsg8-site.docksal
 # Override document root ('docroot' by default)
 DOCROOT=html
 

diff --git a/PATCHES/core-ckeditor5-dialog-fix-3351600.patch b/PATCHES/core-ckeditor5-dialog-fix-3351600.patch
diff --git a/PATCHES/core-css-js-aggregation-3376927.patch b/PATCHES/core-css-js-aggregation-3376927.patch