Merge pull request #171 from bondjimbond/development

Expose PHP variables to make them easier to adjust

docker-compose.code-server.yml

@@ -14,6 +14,10 @@ secrets:
     file: "./secrets/CODE_SERVER_PASSWORD"
 services:
   code-server:
+    environment:
+      PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT}
+      PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE}
+      PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE}
     restart: ${RESTART_POLICY:-unless-stopped}
     image: ${REPOSITORY:-islandora}/code-server:${TAG:-latest}
     labels:
@@ -59,7 +63,11 @@ services:
     depends_on:
       - drupal
   drupal:
-    # Disable traefik for Drupal as code-server will respond to all requests.
+    environment:
+      PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT}
+      PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE}
+      PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE}
+ # Disable traefik for Drupal as code-server will respond to all requests.
     labels:
       - traefik.enable=false
     volumes:
@@ -68,4 +76,4 @@ services:
 volumes:
   drupal-root: {}
   drupal-sites-data: {}
-  code-server-data: {}
+  code-server-data: {}

docker-compose.drupal.yml

@@ -17,6 +17,9 @@ services:
       DRUPAL_DEFAULT_FCREPO_PORT: 8081
       DRUPAL_DEFAULT_MATOMO_URL: https://${DOMAIN}/matomo/
       DRUPAL_DEFAULT_SITE_URL: http://${DOMAIN} # Make sure this is just http and not https!
+      PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT}
+      PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE}
+      PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE}
     labels:
       - traefik.enable=true
       - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-drupal.loadbalancer.server.port=80

sample.env

@@ -70,6 +70,11 @@ DISABLE_SYN=false
 FEDORA_6=true
 RESTART_POLICY=unless-stopped
 
+# PHP variables
+PHP_MEMORY_LIMIT=256M
+PHP_POST_MAX_SIZE=128M
+PHP_UPLOAD_MAX_FILESIZE=128M
+
 # If you're just demoing or are starting from scratch, use this.
 INSTALL_EXISTING_CONFIG=false
 DRUPAL_INSTALL_PROFILE=standard