Skip to content

Commit a25d72d

Browse files
committed
Merge branch 'develop' for v4.4.1
2 parents a2e59d3 + c3c4c5c commit a25d72d

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

.github/workflows/test_and_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
composer install --no-dev --no-progress --no-interaction
4949
else
5050
sed -i 's/\(easyengine\/.*\):\ \".*\"/\1:\ \"dev-develop\"/' composer.json
51-
composer update --prefer-dist --no-progress --no-interaction
51+
composer update --prefer-dist --no-dev --no-progress --no-interaction
5252
fi
5353
5454
- name: Setup EE version

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.4.0
1+
4.4.1

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"easyengine/mailhog-command": "v1.0.2",
3636
"easyengine/service-command": "v1.3.0",
3737
"easyengine/shell-command": "v1.1.0",
38-
"easyengine/site-command": "v2.9.0",
38+
"easyengine/site-command": "v2.9.1",
3939
"easyengine/site-type-php": "v1.6.0",
4040
"easyengine/site-type-wp": "v1.6.0",
4141
"monolog/monolog": "1.24.0",

composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/EE/Runner.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,6 +873,17 @@ private function maybe_trigger_migration() {
873873

874874
if ( ! $db_version ) {
875875
$this->trigger_migration( $current_version );
876+
EE::log( 'ee successfully setup.' );
877+
if ( IS_DARWIN ) {
878+
EE::log( 'To create more than 27 sites follow these steps manually: ' . "\n" .
879+
'1. Please open Docker Desktop and in taskbar, go to Preferences > Daemon > Advanced. ' . "\n" .
880+
'2. If the file is empty, add the following:' . "\n" .
881+
' {' . "\n" .
882+
'"default-address-pools": [{"base":"10.0.0.0/8","size":24}]' . "\n" .
883+
' }' . "\n" .
884+
'If the file already contains JSON, just add the key "default-address-pools": [{"base":"10.0.0.0/8","size":24}] being careful to add a comma to the end of the line if it is not the last line before the closing bracket.' . "\n" .
885+
'3. Restart Docker' );
886+
}
876887
return;
877888
}
878889

0 commit comments

Comments
 (0)