Merge branch 'develop' for v3.2.3

EasyEngine · Jan 13, 2023 · d910ceb · d910ceb
2 parents 0c3e6aa + 0ae2146
commit d910ceb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/migrations/db/20210728160510_site-command_add_daemon_json.php b/migrations/db/20210728160510_site-command_add_daemon_json.php
@@ -30,8 +30,6 @@ public function up() {
 
 			$existin_config['default-address-pools'] = json_decode( '[{"base":"10.0.0.0/8","size":24}]', true );
 			file_put_contents( '/etc/docker/daemon.json', json_encode( $existin_config ) );
-
-			EE::launch( 'command -v systemctl && systemctl restart docker || service docker restart' );
 		}
 	}
 

diff --git a/migrations/db/20230111111011_site-command_update_daemon_json.php b/migrations/db/20230111111011_site-command_update_daemon_json.php
@@ -34,7 +34,10 @@ public function up() {
 
 			file_put_contents( '/etc/docker/daemon.json', json_encode( $existin_config ) );
 
-			EE::launch( 'command -v systemctl && systemctl restart docker || service docker restart' );
+			$return_code = EE::launch( 'command -v systemctl && systemctl restart docker || service docker restart' );
+			if ( $return_code !== 0 ) {
+				EE::launch( 'command -v service && service docker restart || systemctl restart docker' );
+			}
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,8 +30,6 @@ public function up() { @@
     			$existin_config['default-address-pools'] = json_decode( '[{"base":"10.0.0.0/8","size":24}]', true );
     			file_put_contents( '/etc/docker/daemon.json', json_encode( $existin_config ) );
-    			EE::launch( 'command -v systemctl && systemctl restart docker || service docker restart' );
     		}
     	}
@@ Expand Down @@