Skip to content

Commit

Permalink
Merge pull request #630 from humanmade/backport-to-v17-branch
Browse files Browse the repository at this point in the history
Manual Backport to v17 branch
  • Loading branch information
mikelittle authored Oct 2, 2023
2 parents cdf079c + 08bacc7 commit 0b6e8f3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions inc/composer/class-docker-compose-generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ protected function get_config() : array {

$modules = Altis\get_config()['modules'] ?? [];

$analytics_enabled = $modules['analytics']['enabled'] ?? true;
$analytics_enabled = $modules['analytics']['enabled'] ?? false;
$search_enabled = $modules['search']['enabled'] ?? true;

$defaults = [
Expand All @@ -883,7 +883,7 @@ protected function get_config() : array {
'kibana' => ( $analytics_enabled || $search_enabled ),
'xray' => $modules['cloud']['xray'] ?? true,
'ignore-paths' => [],
'php' => '8.0',
'php' => '8.1',
];

return array_merge( $defaults, $modules['local-server'] ?? [] );
Expand Down

0 comments on commit 0b6e8f3

Please sign in to comment.