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

Merge pull request #4886 from coollabsio/next

Browse Source 
v4.0.0-beta.384
This commit is contained in:
Andras Bacsai
2025-01-21 13:12:13 +01:00
committed by GitHub
parent 84e6db4c69 e83164e537
commit 455ae0287d
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -2287,7 +2287,10 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
private function generate_build_env_variables() private function generate_build_env_variables()
{ {
$variables = collect($this->nixpacks_plan_json->get('variables')); $variables = collect($this->nixpacks_plan_json->get('variables'));
$this->build_args = $variables->map(function ($value, $key) { $this->build_args = $variables->map(function ($value, $key) {
$value = escapeshellarg($value);
return "--build-arg {$key}={$value}"; return "--build-arg {$key}={$value}";
}); });
} }

2
config/constants.php
View File

@@ -2,7 +2,7 @@
return [ return [
'coolify' => [ 'coolify' => [
'version' => '4.0.0-beta.383', 'version' => '4.0.0-beta.384',
'self_hosted' => env('SELF_HOSTED', true), 'self_hosted' => env('SELF_HOSTED', true),
'autoupdate' => env('AUTOUPDATE'), 'autoupdate' => env('AUTOUPDATE'),
'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'), 'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),

4
resources/views/livewire/project/database/configuration.blade.php
View File

@@ -20,8 +20,8 @@
href="{{ route('project.database.persistent-storage', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}" href="{{ route('project.database.persistent-storage', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
wire:navigate>Persistent Storage</a> wire:navigate>Persistent Storage</a>
<a class='menu-item' wire:current.exact="menu-item-active" <a class='menu-item' wire:current.exact="menu-item-active"
href="{{ route('project.database.import-backups', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}" href="{{ route('project.database.import-backups', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}">Import
wire:navigate>Import Backups</a> Backups</a>
<a class='menu-item' wire:current.exact="menu-item-active" <a class='menu-item' wire:current.exact="menu-item-active"
href="{{ route('project.database.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}" href="{{ route('project.database.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
wire:navigate>Webhooks</a> wire:navigate>Webhooks</a>

2
resources/views/livewire/project/service/index.blade.php
View File

@@ -13,7 +13,7 @@
@if ($serviceDatabase?->isBackupSolutionAvailable()) @if ($serviceDatabase?->isBackupSolutionAvailable())
<a :class="activeTab === 'backups' && 'menu-item-active'" class="menu-item" <a :class="activeTab === 'backups' && 'menu-item-active'" class="menu-item"
@click.prevent="activeTab = 'backups'; window.location.hash = 'backups'" @click.prevent="activeTab = 'backups'; window.location.hash = 'backups'"
wire:navigate href="#">Backups</a> wire:navigate href="#backups">Backups</a>
@endif @endif
</div> </div>
<div class="w-full"> <div class="w-full">

5
templates/compose/cloudflared.yaml
View File

@@ -11,3 +11,8 @@ services:
command: tunnel --no-autoupdate run command: tunnel --no-autoupdate run
environment: environment:
- 'TUNNEL_TOKEN=${CLOUDFLARE_TUNNEL_TOKEN}' - 'TUNNEL_TOKEN=${CLOUDFLARE_TUNNEL_TOKEN}'
healthcheck:
test: ["CMD", "cloudflared", "--version"]
interval: 5s
timeout: 20s
retries: 10

4
versions.json
View File

@@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.383" "version": "4.0.0-beta.384"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.384" "version": "4.0.0-beta.385"
}, },
"helper": { "helper": {
"version": "1.0.4" "version": "1.0.4"