Skip to content

Commit b58067f

Browse files
committed
Merge branch 'fix/nginx-proxy-defining' of https://github.com/mrrobot47/easyengine into mrrobot47-fix/nginx-proxy-defining
2 parents c65fda8 + 8ff42c0 commit b58067f

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

php/EE/Runner.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ private function init_ee() {
6868
$check_requirements = ( [ 'site', 'cmd-dump' ] === $this->arguments ) ? false : $check_requirements;
6969
}
7070

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

php/init-ee.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
define( 'EE_BACKUP_DIR', EE_ROOT_DIR . '/.backup' );
1616
define( 'EE_SERVICE_DIR', EE_ROOT_DIR . '/services' );
17-
define( 'EE_PROXY_TYPE', 'services_global-nginx-proxy_1' );
1817

1918
if ( file_exists( EE_ROOT . '/vendor/autoload.php' ) ) {
2019
define( 'EE_VENDOR_DIR', EE_ROOT . '/vendor' );

0 commit comments

Comments
 (0)