dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Andras Bacsai
2023-04-24 13:25:02 +02:00
parent 9d6c93768d
commit 570461a45f
8 changed files with 358 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Livewire/Application/General.php
View File

@@ -36,6 +36,7 @@ class General extends Component
'application.build_pack' => 'required',
'application.base_directory' => 'required',
'application.publish_directory' => 'nullable',
'application.ports_exposes' => 'nullable',
];
public function instantSave()
{

19
app/Jobs/DeployApplicationJob.php
View File

@@ -118,8 +118,6 @@ class DeployApplicationJob implements ShouldQueue
$this->git_commit = $this->activity->properties->get('commit_sha');
if (!$this->force_rebuild) {
$this->executeNow([
"docker inspect {$this->application->uuid} --format '{{json .Config.Image}}' 2>&1",
], 'stopped_container_image', hideFromOutput: true, ignoreErrors: true);
@@ -216,10 +214,10 @@ class DeployApplicationJob implements ShouldQueue
'container_name' => $this->application->uuid,
'restart' => 'always',
'environment' => [
'PORT' => $this->application->ports_exposes[0]
'PORT' => $this->application->ports_exposes_array[0]
],
'labels' => $this->set_labels_for_applications(),
'expose' => $this->application->ports_exposes,
'expose' => $this->application->ports_exposes_array,
'networks' => [
$this->destination->network,
],
@@ -243,8 +241,8 @@ class DeployApplicationJob implements ShouldQueue
]
]
];
if (count($this->application->ports_mappings) > 0) {
$docker_compose['services'][$this->application->uuid]['ports'] = $this->application->ports_mappings;
if (count($this->application->ports_mappings_array) > 0) {
$docker_compose['services'][$this->application->uuid]['ports'] = $this->application->ports_mappings_array;
}
if (count($persistentStorages) > 0) {
$docker_compose['services'][$this->application->uuid]['volumes'] = $persistentStorages;
@@ -279,7 +277,7 @@ class DeployApplicationJob implements ShouldQueue
private function generate_healthcheck_commands()
{
if (!$this->application->health_check_port) {
$this->application->health_check_port = $this->application->ports_exposes[0];
$this->application->health_check_port = $this->application->ports_exposes_array[0];
}
if ($this->application->health_check_path) {
$generated_healthchecks_commands = [
@@ -374,13 +372,13 @@ class DeployApplicationJob implements ShouldQueue
private function setGitImportSettings($git_clone_command)
{
if ($this->application->git_commit_sha) {
$git_clone_command = "{$git_clone_command} && git checkout {$this->application->git_commit_sha}";
$git_clone_command = "{$git_clone_command} && cd {$this->workdir} && git checkout {$this->application->git_commit_sha}";
}
if ($this->application->settings->is_git_submodules_allowed) {
$git_clone_command = "{$git_clone_command} && git submodule update --init --recursive";
$git_clone_command = "{$git_clone_command} && cd {$this->workdir} && git submodule update --init --recursive";
}
if ($this->application->settings->is_git_lfs_allowed) {
$git_clone_command = "{$git_clone_command} && git lfs pull";
$git_clone_command = "{$git_clone_command} && cd {$this->workdir} && git lfs pull";
}
return $git_clone_command;
}
@@ -397,6 +395,7 @@ class DeployApplicationJob implements ShouldQueue
if ($this->source->is_public) {
$git_clone_command = "{$git_clone_command} {$this->source->html_url}/{$this->application->git_repository}.git {$this->workdir}";
$git_clone_command = $this->setGitImportSettings($git_clone_command);
dump($git_clone_command);
return [
$this->execute_in_builder($git_clone_command)
];

16
app/Models/Application.php
View File

@@ -37,23 +37,23 @@ class Application extends BaseModel
return $this->morphMany(LocalPersistentVolume::class, 'resource');
}
public function portsMappings(): Attribute
public function portsMappingsArray(): Attribute
{
return Attribute::make(
get: fn (string|null $portsMappings) =>
is_null($portsMappings)
get: fn () =>
is_null($this->ports_mappings)
? []
: explode(',', $portsMappings)
: explode(',', $this->ports_mappings)
);
}
public function portsExposes(): Attribute
public function portsExposesArray(): Attribute
{
return Attribute::make(
get: fn (string|null $portsExposes) =>
is_null($portsExposes)
get: fn () =>
is_null($this->ports_exposes)
? []
: explode(',', $portsExposes)
: explode(',', $this->ports_exposes)
);
}