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

Merge pull request #2669 from coollabsio/next

Browse Source 
v4.0.0-beta.302
This commit is contained in:
Andras Bacsai 2024-06-24 20:56:48 +02:00 committed by GitHub
commit f0b2f6eb00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Livewire/Project/Service/StackForm.php
View File

@ -81,7 +81,6 @@ class StackForm extends Component
return handleError($e, $this); return handleError($e, $this);
} finally { } finally {
if (is_null($this->service->config_hash)) { if (is_null($this->service->config_hash)) {
ray('asdf');
$this->service->isConfigurationChanged(true); $this->service->isConfigurationChanged(true);
} else { } else {
$this->dispatch('configurationChanged'); $this->dispatch('configurationChanged');

3
app/Models/Service.php
View File

@ -842,7 +842,7 @@ class Service extends BaseModel
$envs_from_coolify = $this->environment_variables()->get(); $envs_from_coolify = $this->environment_variables()->get();
foreach ($json['services'] as $service => $config) { foreach ($json['services'] as $service => $config) {
$envs = collect($config['environment']); $envs = collect($config['environment']);
$envs->push("COOLIFY_CONTAINER_NAME=$service-{$this->uuid}"); $envs->put('COOLIFY_CONTAINER_NAME', "$service-{$this->uuid}");
foreach ($envs_from_coolify as $env) { foreach ($envs_from_coolify as $env) {
$envs = $envs->map(function ($value) use ($env) { $envs = $envs->map(function ($value) use ($env) {
if (str($value)->startsWith($env->key)) { if (str($value)->startsWith($env->key)) {
@ -855,7 +855,6 @@ class Service extends BaseModel
$envs = $envs->unique(); $envs = $envs->unique();
data_set($json, "services.$service.environment", $envs->toArray()); data_set($json, "services.$service.environment", $envs->toArray());
} }
$this->docker_compose = Yaml::dump($json, 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK); $this->docker_compose = Yaml::dump($json, 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
$docker_compose_base64 = base64_encode($this->docker_compose); $docker_compose_base64 = base64_encode($this->docker_compose);

2
config/sentry.php
View File

@ -7,7 +7,7 @@ return [
// The release version of your application // The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.301', 'release' => '4.0.0-beta.302',
// When left empty or `null` the Laravel environment will be used // When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'), 'environment' => config('app.env'),

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.301'; return '4.0.0-beta.302';

2
versions.json
View File

@ -1,7 +1,7 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.301" "version": "4.0.0-beta.302"
} }
} }
} }