From 693b04b9fa5b4caad0cb8aff61c0d29713b84db4 Mon Sep 17 00:00:00 2001 From: 0xRenegade Date: Thu, 12 Aug 2021 21:51:28 -0500 Subject: [PATCH 1/3] Fix for issue #1388 --- php/EE/Runner.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index 74b851173..3162b9b14 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -72,19 +72,15 @@ private function init_ee() { $nginx_proxy = 'services_global-nginx-proxy_1'; if ( $check_requirements ) { $launch = EE::launch( sprintf( 'cd %s && docker ps -q --no-trunc | grep $(docker-compose ps -q global-nginx-proxy)', EE_SERVICE_DIR ) ); - if ( 0 === $launch->return_code ) { + if ( 0 === $launch->return_code && ! defined( 'EE_PROXY_TYPE' ) ) { $nginx_proxy = trim( $launch->stdout ); + define( 'EE_PROXY_TYPE', $nginx_proxy ); } - define( 'EE_PROXY_TYPE', $nginx_proxy ); $this->check_requirements(); $this->maybe_trigger_migration(); } - if ( ! defined( 'EE_PROXY_TYPE' ) ) { - define('EE_PROXY_TYPE', $nginx_proxy); - } - if ( [ 'cli', 'info' ] === $this->arguments && $this->check_requirements( false ) ) { $this->maybe_trigger_migration(); } From 900d7131b19ac2737338f6ccf905704e8df0494e Mon Sep 17 00:00:00 2001 From: 0xRenegade Date: Thu, 12 Aug 2021 21:55:47 -0500 Subject: [PATCH 2/3] add back original definition check for 0 arg situations --- php/EE/Runner.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index 3162b9b14..32bbd3c73 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -81,6 +81,10 @@ private function init_ee() { $this->maybe_trigger_migration(); } + if (! defined( 'EE_PROXY_TYPE' ) ) { + define( 'EE_PROXY_TYPE', $nginx_proxy); + } + if ( [ 'cli', 'info' ] === $this->arguments && $this->check_requirements( false ) ) { $this->maybe_trigger_migration(); } From 5fa0541f9441505fdea7a0a2dcd2f3ba78b7f843 Mon Sep 17 00:00:00 2001 From: 0xRenegade Date: Thu, 12 Aug 2021 21:57:22 -0500 Subject: [PATCH 3/3] missing space --- php/EE/Runner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/EE/Runner.php b/php/EE/Runner.php index 32bbd3c73..19ec07051 100644 --- a/php/EE/Runner.php +++ b/php/EE/Runner.php @@ -81,7 +81,7 @@ private function init_ee() { $this->maybe_trigger_migration(); } - if (! defined( 'EE_PROXY_TYPE' ) ) { + if ( ! defined( 'EE_PROXY_TYPE' ) ) { define( 'EE_PROXY_TYPE', $nginx_proxy); }