Skip to content

Commit cbb9344

Browse files
committed
Swtich to debug statements
Signed-off-by: Riddhesh Sanghvi <[email protected]>
1 parent 69c7d28 commit cbb9344

3 files changed

+11
-7
lines changed

migrations/db/20230312102550_easyengine_check_and_update_docker.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class CheckAndUpdateDocker extends Base {
1414
*/
1515
public function up() {
1616

17-
EE::log( 'Checking Docker version.' );
17+
EE::debug( 'Checking Docker version.' );
1818
$docker_version = EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout;
1919

2020
if ( version_compare( $docker_version, '20.10.10', '<' ) ) {
@@ -28,7 +28,7 @@ public function up() {
2828

2929
// If it is Linux, proceed with update.
3030
if ( 'Linux' === PHP_OS ) {
31-
EE::log( 'Updating Docker...' );
31+
EE::debug( 'Updating Docker...' );
3232
EE::launch( 'curl -fsSL https://get.docker.com | sh' );
3333
}
3434
}

migrations/db/20240502102550_easyengine_check_and_update_docker_one.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function up() {
2828
return;
2929
}
3030

31-
EE::log( 'Checking Docker version.' );
31+
EE::debug( 'Checking Docker version.' );
3232
$docker_version = trim( EE::launch( 'docker version --format "{{.Server.Version}}"' )->stdout );
3333

3434
if ( version_compare( $docker_version, '20.10.10', '<' ) ) {
@@ -42,24 +42,26 @@ public function up() {
4242

4343
// If it is Linux, proceed with update.
4444
if ( 'Linux' === PHP_OS ) {
45-
EE::log( 'Updating Docker...' );
45+
EE::debug( 'Updating Docker...' );
4646
EE::launch( 'curl -fsSL https://get.docker.com | sh' );
4747
}
4848
}
4949

50-
EE::log( 'Checking docker-compose version' );
50+
EE::debug( 'Checking docker-compose version' );
5151
$docker_compose_version = trim( EE::launch( 'docker-compose version --short' )->stdout );
5252
$docker_compose_path = EE::launch( 'command -v docker-compose' )->stdout;
5353
$docker_compose_path = trim( $docker_compose_path );
5454
$docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup';
55+
$docker_compose_new_path = EE_BACKUP_DIR . '/docker-compose';
5556
$fs = new Filesystem();
5657
if ( ! $fs->exists( EE_BACKUP_DIR ) ) {
5758
$fs->mkdir( EE_BACKUP_DIR );
5859
}
5960
$fs->copy( $docker_compose_path, $docker_compose_backup_path );
6061

6162
if ( version_compare( '1.29.2', $docker_compose_version, '!=' ) ) {
62-
EE::exec( "curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" );
63+
EE::exec( "curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_new_path && chmod +x $docker_compose_new_path" );
64+
EE::exec( "mv $docker_compose_new_path $docker_compose_path" );
6365
}
6466

6567
// Check the version again post update.

php/EE/Migration/Containers.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ public static function update_docker_compose() {
132132
$docker_compose_path = EE::launch( 'command -v docker-compose' )->stdout;
133133
$docker_compose_path = trim( $docker_compose_path );
134134
$docker_compose_backup_path = EE_BACKUP_DIR . '/docker-compose.backup';
135+
$docker_compose_new_path = EE_BACKUP_DIR . '/docker-compose';
135136

136137
if ( version_compare( '2.27.0', $docker_compose_version, '>' ) ) {
137138

@@ -141,7 +142,8 @@ public static function update_docker_compose() {
141142
}
142143
$fs->copy( $docker_compose_path, $docker_compose_backup_path );
143144

144-
EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_path && chmod +x $docker_compose_path" );
145+
EE::exec( "curl -L https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m) -o $docker_compose_new_path && chmod +x $docker_compose_new_path" );
146+
EE::exec( "mv $docker_compose_new_path $docker_compose_path" );
145147
}
146148
}
147149

0 commit comments

Comments
 (0)