Skip to content

fix(service): recreate a stopped global service from the compose file on enable #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrrobot47 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(service): recreate a stopped global service from the compose file on enable #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Service_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public function enable( $args, $assoc_args ) {
EE::Log( 'Notice: Service nginx_proxy already enabled.' );
}
} else {
$service_status = \EE\Service\Utils\init_global_container( $service );
// Recreate, not `docker start`: an upgrade leaves a stopped service on its old image for this to move.
$service_status = \EE\Service\Utils\init_global_container( $service, '', true );
if ( $service_status ) {
EE::success( sprintf( 'Service %s enabled.', $service ) );
} else {
Expand Down
12 changes: 10 additions & 2 deletions src/helper/service-utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,9 @@ function nginx_proxy_check() {
* Function to start global conainer if it is not running.
*
* @param string $container Global container to be brought up.
* @param bool $recreate `up -d` a stopped container too, which recreates it when the compose file changed (e.g. its image).
*/
function init_global_container( $service, $container = '' ) {
function init_global_container( $service, $container = '', $recreate = false ) {

if ( empty( $container ) ) {
$container = 'services_' . $service . '_1';
Expand All @@ -96,7 +97,14 @@ function init_global_container( $service, $container = '' ) {
if ( IS_DARWIN && GLOBAL_DB === $service && ! $fs->exists( $db_conf_file ) ) {
$fs->copy( SERVICE_TEMPLATE_ROOT . '/my.cnf.mustache', $db_conf_file );
}
\EE_DOCKER::boot_container( $container, \EE_DOCKER::docker_compose_with_custom() . ' up -d ' . $service );
$up = \EE_DOCKER::docker_compose_with_custom() . ' up -d ' . $service;
if ( $recreate ) {
if ( ! EE::exec( $up ) ) {
EE::error( "There was some error in starting $container. Please check logs." );
}
} else {
\EE_DOCKER::boot_container( $container, $up );
}
return true;
} else {
return false;
Expand Down