Skip to content

Commit

Permalink
Merge branch 'develop' for v4.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mrrobot47 committed Jan 2, 2023
2 parents 4127dd1 + 7283b97 commit f473546
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.6.3
4.6.4
14 changes: 7 additions & 7 deletions img-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"easyengine/mariadb": "v4.6.3",
"easyengine/nginx-proxy": "v4.6.3",
"easyengine/nginx": "v4.6.3",
"easyengine/php": "v4.6.3",
"easyengine/php": "v4.6.4",
"easyengine/php5.6": "v4.6.3",
"easyengine/php7.0": "v4.6.3",
"easyengine/php7.2": "v4.6.3",
"easyengine/php7.3": "v4.6.3",
"easyengine/php7.4": "v4.6.3",
"easyengine/php8.0": "v4.6.3",
"easyengine/php8.1": "v4.6.3",
"easyengine/php7.0": "v4.6.4",
"easyengine/php7.2": "v4.6.4",
"easyengine/php7.3": "v4.6.4",
"easyengine/php7.4": "v4.6.4",
"easyengine/php8.0": "v4.6.4",
"easyengine/php8.1": "v4.6.4",
"easyengine/postfix": "v4.6.3",
"easyengine/redis": "v4.6.3",
"easyengine/newrelic-daemon": "v4.6.3"
Expand Down
2 changes: 1 addition & 1 deletion php/commands/src/CLI_Command.php
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public function update( $_, $assoc_args ) {
} elseif ( ! is_writable( dirname( $old_phar ) ) ) {
EE::error( sprintf( '%s is not writable by current user.', dirname( $old_phar ) ) );
}
EE::confirm( "Note: It is recommended to run EasyEngine update in tmux/screen. Update at times may take some time.\n\nTo view progress, tail logs in a different window using `tail -f /opt/easyengine/logs/ee.log`.\n\nAre you sure you want to continue?", $assoc_args );
EE::confirm( "Note: 1. It is recommended to run EasyEngine update in tmux/screen.\n2. Have minimum 5GB free disk space.\nUpdate at times may take some time.\n\nTo view progress, tail logs in a different window using `tail -f /opt/easyengine/logs/ee.log`.\n\nAre you sure you want to continue?", $assoc_args );
if ( Utils\get_flag_value( $assoc_args, 'nightly' ) ) {
EE::confirm( sprintf( 'You have version %s. Would you like to update to the latest nightly?', EE_VERSION ), $assoc_args );
$download_url = 'https://raw.githubusercontent.com/EasyEngine/easyengine-builds/master/phar/easyengine-nightly.phar';
Expand Down

0 comments on commit f473546

Please sign in to comment.