Skip to content

Commit 3587dd1

Browse files
committed
Merge branch 'mrrobot47-update/migration-site-enable' into develop-v4
2 parents 105cfed + 87e6cbc commit 3587dd1

File tree

6 files changed

+5
-132
lines changed

6 files changed

+5
-132
lines changed

docs/build-and-release.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

docs/developer-docs.md

Lines changed: 0 additions & 91 deletions
This file was deleted.

docs/docker-files.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

docs/structure-for-multiple-repos.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

php/EE/Migration/SiteContainers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public static function generate_site_docker_compose_file( $site_info, $site_obje
111111
public static function enable_site( $site_info, $site_object ) {
112112
EE::debug( "Start enabling ${site_info['site_url']}" );
113113
try {
114-
$site_object->enable( [ $site_info['site_url'] ], [], false );
114+
$site_object->enable( [ $site_info['site_url'] ], [ 'force' => true ], false );
115115
} catch ( \Exception $e ) {
116116
throw new \Exception( $e->getMessage() );
117117
}

php/EE/Runner.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -857,8 +857,10 @@ private function trigger_migration( $version ) {
857857
if ( ! $this->migrate() ) {
858858
EE::error( 'There was some error while migrating. Please check logs.' );
859859
}
860-
Option::set( 'version', $version );
861-
\EE\Service\Utils\set_nginx_proxy_version_conf();
860+
if ( $version !== Option::get( 'version' ) ) {
861+
Option::set( 'version', $version );
862+
\EE\Service\Utils\set_nginx_proxy_version_conf();
863+
}
862864
}
863865

864866
/**

0 commit comments

Comments
 (0)