Skip to content

Commit 44417b9

Browse files
committed
Remove Nginx proxy id fecthing
Signed-off-by: Riddhesh Sanghvi <[email protected]>
1 parent 199c16c commit 44417b9

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

php/EE/Migration/GlobalContainers.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,8 @@ public static function global_service_down( $service_name ) {
129129
*/
130130
public static function get_all_global_images_with_service_name() {
131131

132-
$launch = EE::launch( sprintf( 'docker ps -f "id=%s" --format={{.Names}}', EE_PROXY_TYPE ) );
133-
if ( 0 === $launch->return_code ) {
134-
$nginx_proxy = trim( $launch->stdout );
135-
}
136132
return [
137-
'easyengine/nginx-proxy' => $nginx_proxy,
133+
'easyengine/nginx-proxy' => GLOBAL_PROXY_CONTAINER,
138134
'easyengine/mariadb' => GLOBAL_DB_CONTAINER,
139135
'easyengine/redis' => GLOBAL_REDIS_CONTAINER,
140136
// 'easyengine/cron' => EE_CRON_SCHEDULER, //TODO: Add it to global docker-compose.

php/EE/Runner.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,12 @@ private function init_ee() {
6969
$check_requirements = ( [ 'site', 'cmd-dump' ] === $this->arguments ) ? false : $check_requirements;
7070
}
7171

72-
$nginx_proxy = 'services_global-nginx-proxy_1';
72+
define( 'EE_PROXY_TYPE', 'services_global-nginx-proxy_1' );
7373
if ( $check_requirements ) {
74-
$launch = EE::launch( sprintf( 'cd %s && docker ps -q --no-trunc | grep $(docker-compose ps -q global-nginx-proxy)', EE_SERVICE_DIR ) );
75-
if ( 0 === $launch->return_code ) {
76-
$nginx_proxy = trim( $launch->stdout );
77-
}
78-
define( 'EE_PROXY_TYPE', $nginx_proxy );
79-
8074
$this->check_requirements();
8175
$this->maybe_trigger_migration();
8276
}
8377

84-
if ( ! defined( 'EE_PROXY_TYPE' ) ) {
85-
define('EE_PROXY_TYPE', $nginx_proxy);
86-
}
87-
8878
if ( [ 'cli', 'info' ] === $this->arguments && $this->check_requirements( false ) ) {
8979
$this->maybe_trigger_migration();
9080
}

0 commit comments

Comments
 (0)