Skip to content

Commit 7e4f1f8

Browse files
committed
Merge branch 'mrrobot47-fix/GH-EE#1204' into develop
2 parents deb8923 + b98f553 commit 7e4f1f8

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/WordPress.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ private function maybe_verify_remote_db_connection() {
374374
// The since we're inside the container and we want to access host machine,
375375
// we would need to replace localhost with default gateway.
376376
if ( $this->site_data['db_host'] === '127.0.0.1' || $this->site_data['db_host'] === 'localhost' ) {
377-
$launch = \EE::exec( sprintf( "docker network inspect %s --format='{{ (index .IPAM.Config 0).Gateway }}'", $this->site_data['site_url'] ), false, true );
377+
$launch = \EE::launch( sprintf( "docker network inspect %s --format='{{ (index .IPAM.Config 0).Gateway }}'", $this->site_data['site_url'] ) );
378378

379379
if ( ! $launch->return_code ) {
380380
$this->site_data['db_host'] = trim( $launch->stdout, "\n" );
@@ -553,7 +553,11 @@ private function install_wp() {
553553
$install_command .= $this->site_data['app_admin_password'] ? sprintf( ' --admin_password=\'%s\'', $this->site_data['app_admin_password'] ) : '';
554554
$install_command .= sprintf( ' --admin_email=\'%s\' %s', $this->site_data['app_admin_email'], $maybe_multisite_type );
555555

556-
$core_install = \EE::exec( $install_command );
556+
$core_install = \EE::exec( $install_command, false, false, [
557+
$this->site_data['app_admin_username'],
558+
$this->site_data['app_admin_email'],
559+
$this->site_data['app_admin_password'],
560+
] );
557561

558562
if ( ! $core_install ) {
559563
\EE::warning( 'WordPress install failed. Please check logs.' );

0 commit comments

Comments
 (0)