Skip to content

Commit

Permalink
Merge branch 'develop' into update/build
Browse files Browse the repository at this point in the history
  • Loading branch information
mrrobot47 authored Oct 14, 2024
2 parents 96eeff8 + f59b42b commit ed9a4cf
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"prefer-stable": true,
"require": {
"php": ">=7.0",
"composer/composer": "2.2.23",
"composer/composer": "2.2.24",
"composer/semver": "3.2.4",
"daverandom/libdns": "^2.0",
"easyengine/admin-tools-command": "v1.1.0",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions php/EE/Migration/SiteContainers.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ public static function is_site_service_image_changed( $updated_images, $site_inf
*/
public static function generate_site_docker_compose_file( $site_info, $site_object ) {
$site_object->populate_site_info( $site_info['site_url'] );
EE::debug( "Start generating news docker-compose.yml for ${site_info['site_url']}" );
EE::debug( "Start generating new docker-compose.yml for ${site_info['site_url']}" );
$site_object->dump_docker_compose_yml( [ 'nohttps' => ! $site_info['site_ssl'] ] );
EE::debug( "Complete generating news docker-compose.yml for ${site_info['site_url']}" );
EE::debug( "Complete generating new docker-compose.yml for ${site_info['site_url']}" );
}

/**
Expand Down

0 comments on commit ed9a4cf

Please sign in to comment.