Merge pull request #686 from UN-OCHA/local-stack-update-for-consistency

chore: update local stack for consistency
UN-OCHA · Dec 4, 2023 · 418d71e · 418d71e
2 parents d16c4d3 + db45f35
commit 418d71e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/local/README.md b/local/README.md
@@ -45,7 +45,7 @@ After modifications to the composer files (for example, after the automatic comp
 
 When a new image used by a service has been created by the OPS team (ex: new mysql or php image):
 
-- Run `./local/insall.sh -u -d` to pull the service and base site images, recreate the local site image and the containers and install the dev dependencies.
+- Run `./local/install.sh -u -d` to pull the service and base site images, recreate the local site image and the containers and install the dev dependencies.
 
 When an image **with a new tag** has been created, then update the `local/docker-compose.yml` or the `docker/Dockerfile` accordingly before running the update command above.
 

diff --git a/local/docker-compose.yml b/local/docker-compose.yml
@@ -73,6 +73,8 @@ services:
       # Mount volumes for the private and public files.
       - "site-public:/srv/www/html/sites/default/files:rw"
       - "site-private:/srv/www/html/sites/default/private:rw"
+      # A place for database backups to be installed.
+      - "../database:/srv/www/database:ro"
       # Mount the folders needed for the tests.
       - "../phpcs.xml:/srv/www/phpcs.xml:ro"
       - "../phpunit.xml:/srv/www/phpunit.xml:ro"

diff --git a/local/shared/settings/services.yml b/local/shared/settings/services.yml
@@ -3,7 +3,7 @@
 # To activate this feature, follow the instructions at the top of the
 # 'example.settings.local.php' file, which sits next to this file.
 parameters:
-  http.response.debug_cacheability_headers: false
+  http.response.debug_cacheability_headers: true
   twig.config:
     # Twig debugging:
     #

diff --git a/local/shared/settings/settings.local.php b/local/shared/settings/settings.local.php
@@ -177,4 +177,3 @@
   $settings['cache']['bins']['page'] = 'cache.backend.null';
   $settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null';
 }
-
diff --git a/local/shared/settings/settings.memcache.php b/local/shared/settings/settings.memcache.php
@@ -14,7 +14,7 @@
   if (file_exists('modules/contrib/memcache/memcache.services.yml')) {
     $settings['container_yamls'][] = 'modules/contrib/memcache/memcache.services.yml';
   }
-  elseif (file_exists('modules/memcache/memcache.services.yml')) {
+  else if (file_exists('modules/memcache/memcache.services.yml')) {
     $settings['container_yamls'][] = 'modules/memcache/memcache.services.yml';
   }
   // Configure memcache.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -177,4 +177,3 @@
		$settings['cache']['bins']['page'] = 'cache.backend.null';
		$settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null';
		}