ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2026-02-04 12:34:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Andras Bacsai
2023-05-25 12:00:09 +02:00
parent 5a1a33242c
commit f766600fd8
41 changed files with 151 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -18,6 +18,8 @@ use Illuminate\Support\Facades\Storage;
use Spatie\Activitylog\Models\Activity;
use Symfony\Component\Yaml\Yaml;
use Illuminate\Support\Str;
use LocalStorage;
use Log;
use Spatie\Url\Url;
class ApplicationDeploymentJob implements ShouldQueue
@@ -203,7 +205,7 @@ COPY --from={$this->application->uuid}:{$this->git_commit}-build /app/{$this->ap
$this->fail();
} finally {
if (isset($this->docker_compose)) {
Storage::disk('deployments')->put(Str::kebab($this->application->name) . '/docker-compose.yml', $this->docker_compose);
LocalStorage::deployments()->put(Str::kebab($this->application->name) . '/docker-compose.yml', $this->docker_compose);
}
$this->execute_now(["docker rm -f {$this->deployment_uuid} >/dev/null 2>&1"], hideFromOutput: true);
}

2
app/Jobs/ContainerStatusJob.php
View File

@@ -21,7 +21,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeUnique
public string|null $application_id = null,
) {
if ($this->application_id) {
$this->application = Application::find($this->application_id)->first();
$this->application = Application::find($this->application_id);
}
}
public function uniqueId(): string

39
app/Jobs/ContainerStopJob.php
View File

@@ -1,39 +0,0 @@
<?php
namespace App\Jobs;
use App\Models\Application;
use App\Models\Server;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log;
class ContainerStopJob implements ShouldQueue, ShouldBeUnique
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public function __construct(
public int $application_id,
public Server $server,
) {
}
public function uniqueId(): int
{
return $this->application_id;
}
public function handle(): void
{
try {
$application = Application::find($this->application_id)->first();
instant_remote_process(["docker rm -f {$application->uuid}"], $this->server);
$application->status = get_container_status(server: $application->destination->server, container_id: $application->uuid);
$application->save();
} catch (\Exception $e) {
Log::error($e->getMessage());
}
}
}