Fixed Drupal file paths variables in docker-compose.yml.

drevops · May 13, 2024 · 1f24419 · 1f24419 · github-actions · May 13, 2024
1 parent 03c7dc3
commit 1f24419
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json b/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json
@@ -209,8 +209,8 @@
             "build": {
                 "args": {
                     "CLI_IMAGE": "the_matrix",
-                    "DRUPAL_PRIVATE_FILES": "/app/docroot/sites/default/files/private",
-                    "DRUPAL_PUBLIC_FILES": "/app/docroot/sites/default/files",
+                    "DRUPAL_PRIVATE_FILES": "/app/web/sites/default/files/private",
+                    "DRUPAL_PUBLIC_FILES": "/app/web/sites/default/files",
                     "DRUPAL_TEMPORARY_FILES": "/tmp",
                     "WEBROOT": "docroot"
                 },

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -114,8 +114,8 @@ services:
       args:
         CLI_IMAGE: *cli-image
         WEBROOT: "${DREVOPS_WEBROOT:-web}"
-        DRUPAL_PUBLIC_FILES: ${DRUPAL_PUBLIC_FILES:-/app/${DREVOPS_WEBROOT:-web}/sites/default/files}
-        DRUPAL_PRIVATE_FILES: ${DRUPAL_PRIVATE_FILES:-/app/${DREVOPS_WEBROOT:-web}/sites/default/files/private}
+        DRUPAL_PUBLIC_FILES: ${DRUPAL_PUBLIC_FILES:-/app/web/sites/default/files}
+        DRUPAL_PRIVATE_FILES: ${DRUPAL_PRIVATE_FILES:-/app/web/sites/default/files/private}
         DRUPAL_TEMPORARY_FILES: ${DRUPAL_TEMPORARY_FILES:-/tmp}
     <<: [*default-volumes, *default-user]
     environment: