fix: use correct syntax for env vars (#8)

- Update DRUPAL_ROOT and DRUPAL_SITE_DIR to use DOCROOT_SUBDIR instead of DRUPAL_ROOT for consistency and clarity.
nymedia · May 21, 2024 · 97219ba · 97219ba
1 parent 8e1183e
commit 97219ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/templates/drupal-cron/default.Dockerfile b/templates/drupal-cron/default.Dockerfile
@@ -15,8 +15,8 @@ ENV APP_ROOT=/var/www/html
 ENV DOCROOT_SUBDIR=drupal
 
 ENV DRUPAL_SITE=default
-ENV DRUPAL_ROOT=${APP_ROOT}/${DRUPAL_ROOT}
-ENV DRUPAL_SITE_DIR=$(DRUPAL_ROOT)/sites/$(DRUPAL_SITE)
+ENV DRUPAL_ROOT=${APP_ROOT}/${DOCROOT_SUBDIR}
+ENV DRUPAL_SITE_DIR=${DRUPAL_ROOT}/sites/${DRUPAL_SITE}
 ENV DRUPAL_FILES_DIR=${DRUPAL_SITE_DIR}/files
 ENV DRUPAL_FILES_SYNC_SALT=not-in-use-but-required
 ENV DRUPAL_PHP_STORAGE_DIR=/tmp/php

diff --git a/templates/drupal-php/default.Dockerfile b/templates/drupal-php/default.Dockerfile
@@ -12,8 +12,8 @@ ENV APP_ROOT=/var/www/html
 ENV DOCROOT_SUBDIR=drupal
 
 ENV DRUPAL_SITE=default
-ENV DRUPAL_ROOT=${APP_ROOT}/${DRUPAL_ROOT}
-ENV DRUPAL_SITE_DIR=$(DRUPAL_ROOT)/sites/$(DRUPAL_SITE)
+ENV DRUPAL_ROOT=${APP_ROOT}/${DOCROOT_SUBDIR}
+ENV DRUPAL_SITE_DIR=${DRUPAL_ROOT}/sites/${DRUPAL_SITE}
 ENV DRUPAL_FILES_DIR=${DRUPAL_SITE_DIR}/files
 ENV DRUPAL_FILES_SYNC_SALT=not-in-use-but-required
 ENV DRUPAL_PHP_STORAGE_DIR=/tmp/php