mirror of
https://github.com/opdavies/build-configs.git
synced 2025-03-13 05:26:56 +00:00
feat: make the Drupal docroot configurable
Allow for setting a `docroot` directory for Drupal projects. By default, I've set this to `web` as that's what the Drupal Composer scaffold projects use, but other platforms such as Acquia Cloud hosting use `docroot`. This is how it can be configured in `build.yaml`: ```yaml drupal: docroot: docroot ``` Fixes #2
This commit is contained in:
parent
8e1d0bae84
commit
1fb75c9d93
|
@ -81,6 +81,8 @@ final class BuildConfigurationCommand extends Command
|
||||||
|
|
||||||
'database' => new Assert\Optional(),
|
'database' => new Assert\Optional(),
|
||||||
|
|
||||||
|
'drupal' => new Assert\Optional(),
|
||||||
|
|
||||||
'docker-compose' => new Assert\Optional(),
|
'docker-compose' => new Assert\Optional(),
|
||||||
|
|
||||||
'dockerfile' => new Assert\Optional(),
|
'dockerfile' => new Assert\Optional(),
|
||||||
|
@ -137,6 +139,13 @@ final class BuildConfigurationCommand extends Command
|
||||||
$this->filesToGenerate->push(['web/nginx/default.conf', 'tools/docker/images/web/root/etc/nginx/conf.d/default.conf']);
|
$this->filesToGenerate->push(['web/nginx/default.conf', 'tools/docker/images/web/root/etc/nginx/conf.d/default.conf']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ('drupal-project' === Arr::get($configurationData, 'type')) {
|
||||||
|
// Ensure a "docroot" value is set.
|
||||||
|
if (null === Arr::get($configurationData, 'drupal.docroot')) {
|
||||||
|
Arr::set($configurationData, 'drupal.docroot', 'web');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$this->generateFiles($configurationData);
|
$this->generateFiles($configurationData);
|
||||||
|
|
||||||
return Command::SUCCESS;
|
return Command::SUCCESS;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
x-app: &default-app
|
x-app: &default-app
|
||||||
volumes:
|
volumes:
|
||||||
- "${DOCKER_WEB_VOLUME:-./web:/app/web}"
|
- "${DOCKER_WEB_VOLUME:-./{{ drupal.docroot }}:/app/{{ drupal.docroot }}}"
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
|
restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
:80
|
:80
|
||||||
root * /app/docroot
|
root * /app/{{ drupal.docroot }}
|
||||||
file_server
|
file_server
|
||||||
php_fastcgi php:9000
|
php_fastcgi php:9000
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
server {
|
server {
|
||||||
server_name _;
|
server_name _;
|
||||||
|
|
||||||
root /app/docroot;
|
root /app/{{ drupal.docroot }};
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
try_files $uri /index.php?$query_string;
|
try_files $uri /index.php?$query_string;
|
||||||
|
|
Loading…
Reference in a new issue