|
@@ -55,24 +55,36 @@ class UpdateFlowdatModulesCommand extends Command
|
|
|
$output->writeln('-------------------------------------------------------------------------------------');
|
|
|
$output->writeln('Module: ' . $sec);
|
|
|
if ($tag) {
|
|
|
- $command = 'cd ' . $sec . ' && git stash && git checkout -B ' . $versionOnly . ' && git fetch ' . $remote .
|
|
|
+ $command = 'cd ' . $sec . ' && git stash && git checkout -B ' . $versionOnly . ' && git fetch ' . $remote .
|
|
|
' ' . $versionOnly . ':refs/tags/' . $versionOnly . ' && git merge -X theirs ' . $version;
|
|
|
} else {
|
|
|
- $command = 'cd ' . $sec . ' && git stash && git checkout -B ' . $versionOnly . ' && git fetch ' . $remote . ' ' . $version;
|
|
|
+ $command = 'cd ' . $sec . ' && git stash && git checkout -B ' . $versionOnly . ' && git fetch ' . $remote . ' ' . $version;
|
|
|
}
|
|
|
$output->writeln("\tComando: " . $command);
|
|
|
$resp = shell_exec ($command);
|
|
|
- $output->writeln($resp);
|
|
|
- if (count($conf) > 0) {
|
|
|
- $command = "docker-compose exec " . $sec . " composer install";
|
|
|
- $output->writeln("\tComando: " . $command);
|
|
|
- $resp = shell_exec ($command);
|
|
|
- $output->writeln($resp);
|
|
|
- }
|
|
|
+ $output->writeln($resp);
|
|
|
+ // se reemplaza por docker-compose up --force-recreate
|
|
|
+ //if (count($conf) > 0) {
|
|
|
+ // $command = "docker-compose exec " . $sec . " bin/composer-install.sh";
|
|
|
+ // $output->writeln("\tComando: " . $command);
|
|
|
+ // $resp = shell_exec ($command);
|
|
|
+ // $output->writeln($resp);
|
|
|
+ //}
|
|
|
} catch (\Throwable $t) {
|
|
|
$error .= $t->getTraceAsString() . "\n";
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ $command = "docker-compose up -d --force-recreate";
|
|
|
+ $output->writeln("\tComando: " . $command);
|
|
|
+ $resp = shell_exec ($command);
|
|
|
+ $output->writeln($resp);
|
|
|
+
|
|
|
+ sleep(600);
|
|
|
+ $command = "docker-compose stop nginx; sleep 20; docker-compose up -d --force-recreate nginx";
|
|
|
+ $output->writeln("\tComando: " . $command);
|
|
|
+ shell_exec ($command);
|
|
|
+
|
|
|
if (strlen($error) > 0) {
|
|
|
$output->writeln("SE PRODUJERON LOS SIGUIENTES ERRORES: \n" . $error);
|
|
|
/**
|