Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: helper image only pulled if required, not every 10 mins

Browse Source
This commit is contained in:
Andras Bacsai 2024-04-15 11:11:58 +02:00
parent f8a2ee9a8d
commit fe872a59ca
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Kernel.php
View File

@ -31,7 +31,7 @@ protected function schedule(Schedule $schedule): void
$this->check_scheduled_backups($schedule); $this->check_scheduled_backups($schedule);
$this->check_resources($schedule); $this->check_resources($schedule);
$this->check_scheduled_backups($schedule); $this->check_scheduled_backups($schedule);
$this->pull_helper_image($schedule); // $this->pull_helper_image($schedule);
$this->check_scheduled_tasks($schedule); $this->check_scheduled_tasks($schedule);
$schedule->command('uploads:clear')->everyTwoMinutes(); $schedule->command('uploads:clear')->everyTwoMinutes();
} else { } else {
@ -46,7 +46,7 @@ protected function schedule(Schedule $schedule): void
$this->instance_auto_update($schedule); $this->instance_auto_update($schedule);
$this->check_scheduled_backups($schedule); $this->check_scheduled_backups($schedule);
$this->check_resources($schedule); $this->check_resources($schedule);
$this->pull_helper_image($schedule); // $this->pull_helper_image($schedule);
$this->check_scheduled_tasks($schedule); $this->check_scheduled_tasks($schedule);
$schedule->command('cleanup:database --yes')->daily(); $schedule->command('cleanup:database --yes')->daily();

4
app/Jobs/ApplicationDeploymentJob.php
View File

@ -902,6 +902,10 @@ private function prepare_builder_image()
} }
$this->application_deployment_queue->addLogEntry("Preparing container with helper image: $helperImage."); $this->application_deployment_queue->addLogEntry("Preparing container with helper image: $helperImage.");
$this->execute_remote_command( $this->execute_remote_command(
[
"command" => "docker pull -q {$helperImage}",
"hidden" => true
],
[ [
"command" => "docker rm -f {$this->deployment_uuid}", "command" => "docker rm -f {$this->deployment_uuid}",
"ignore_errors" => true, "ignore_errors" => true,