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

Merge pull request #3583 from coollabsio/next

Browse Source 
v4.0.0-beta.345
This commit is contained in:
Andras Bacsai
2024-09-26 13:21:16 +02:00
committed by GitHub
parent e83aecebc3 84b2af53d8
commit 3535dbb98f
7 changed files with 70 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.344', 'release' => '4.0.0-beta.345',
// 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.344'; return '4.0.0-beta.345';

66
database/seeders/ProductionSeeder.php
View File

@@ -65,37 +65,39 @@ class ProductionSeeder extends Seeder
]); ]);
} }
// Add Coolify host (localhost) as Server if it doesn't exist // Add Coolify host (localhost) as Server if it doesn't exist
if (Server::find(0) == null && ! isCloud()) { if (! isCloud()) {
$server_details = [ if (Server::find(0) == null) {
'id' => 0, $server_details = [
'name' => 'localhost', 'id' => 0,
'description' => "This is the server where Coolify is running on. Don't delete this!", 'name' => 'localhost',
'user' => 'root', 'description' => "This is the server where Coolify is running on. Don't delete this!",
'ip' => 'host.docker.internal', 'user' => 'root',
'team_id' => 0, 'ip' => 'host.docker.internal',
'private_key_id' => 0, 'team_id' => 0,
]; 'private_key_id' => 0,
$server_details['proxy'] = ServerMetadata::from([ ];
'type' => ProxyTypes::TRAEFIK->value, $server_details['proxy'] = ServerMetadata::from([
'status' => ProxyStatus::EXITED->value, 'type' => ProxyTypes::TRAEFIK->value,
]); 'status' => ProxyStatus::EXITED->value,
$server = Server::create($server_details); ]);
$server->settings->is_reachable = true; $server = Server::create($server_details);
$server->settings->is_usable = true; $server->settings->is_reachable = true;
$server->settings->save(); $server->settings->is_usable = true;
} else { $server->settings->save();
$server = Server::find(0); } else {
$server->settings->is_reachable = true; $server = Server::find(0);
$server->settings->is_usable = true; $server->settings->is_reachable = true;
$server->settings->save(); $server->settings->is_usable = true;
} $server->settings->save();
if (StandaloneDocker::find(0) == null && ! isCloud()) { }
StandaloneDocker::create([ if (StandaloneDocker::find(0) == null) {
'id' => 0, StandaloneDocker::create([
'name' => 'localhost-coolify', 'id' => 0,
'network' => 'coolify', 'name' => 'localhost-coolify',
'server_id' => 0, 'network' => 'coolify',
]); 'server_id' => 0,
]);
}
} }
if (! isCloud() && config('coolify.is_windows_docker_desktop') == false) { if (! isCloud() && config('coolify.is_windows_docker_desktop') == false) {
@@ -112,8 +114,8 @@ class ProductionSeeder extends Seeder
} }
} else { } else {
if ($coolify_key) { if ($coolify_key) {
$coolify_key = Storage::disk('ssh-keys')->get($coolify_key);
$user = str($coolify_key)->before('@')->after('id.'); $user = str($coolify_key)->before('@')->after('id.');
$coolify_key = Storage::disk('ssh-keys')->get($coolify_key);
PrivateKey::create([ PrivateKey::create([
'id' => 0, 'id' => 0,
'team_id' => 0, 'team_id' => 0,

38
resources/views/livewire/project/service/configuration.blade.php
View File

@@ -76,7 +76,7 @@
@endif @endif
@if ($application->fqdn) @if ($application->fqdn)
<span class="flex gap-1 text-xs">{{ Str::limit($application->fqdn, 60) }} <span class="flex gap-1 text-xs">{{ Str::limit($application->fqdn, 60) }}
<x-modal-input title="Edit Domains"> <x-modal-input title="Edit Domains" :closeOutside="false">
<x-slot:content> <x-slot:content>
<span class="cursor-pointer"> <span class="cursor-pointer">
<svg xmlns="http://www.w3.org/2000/svg" <svg xmlns="http://www.w3.org/2000/svg"
@@ -107,15 +107,14 @@
Settings Settings
</a> </a>
@if (str($application->status)->contains('running')) @if (str($application->status)->contains('running'))
<x-modal-confirmation <x-modal-confirmation title="Confirm Service Application Restart?"
title="Confirm Service Application Restart?" buttonTitle="Restart"
buttonTitle="Restart" submitAction="restartApplication({{ $application->id }})" :actions="[
submitAction="restartApplication({{ $application->id }})" 'The selected service application will be unavailable during the restart.',
:actions="['The selected service application will be unavailable during the restart.', 'If the service application is currently in use data could be lost.']" 'If the service application is currently in use data could be lost.',
:confirmWithText="false" ]"
:confirmWithPassword="false" :confirmWithText="false" :confirmWithPassword="false"
step2ButtonText="Restart Service Container" step2ButtonText="Restart Service Container" />
/>
@endif @endif
</div> </div>
</div> </div>
@@ -155,15 +154,13 @@
Settings Settings
</a> </a>
@if (str($database->status)->contains('running')) @if (str($database->status)->contains('running'))
<x-modal-confirmation <x-modal-confirmation title="Confirm Service Database Restart?"
title="Confirm Service Database Restart?" buttonTitle="Restart" submitAction="restartDatabase({{ $database->id }})"
buttonTitle="Restart" :actions="[
submitAction="restartDatabase({{ $database->id }})" 'This service database will be unavailable during the restart.',
:actions="['This service database will be unavailable during the restart.', 'If the service database is currently in use data could be lost.']" 'If the service database is currently in use data could be lost.',
:confirmWithText="false" ]" :confirmWithText="false" :confirmWithPassword="false"
:confirmWithPassword="false" step2ButtonText="Restart Database" />
step2ButtonText="Restart Database"
/>
@endif @endif
</div> </div>
</div> </div>
@@ -183,7 +180,8 @@
lazy /> lazy />
@endforeach @endforeach
@foreach ($databases as $database) @foreach ($databases as $database)
<livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" lazy /> <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database"
lazy />
@endforeach @endforeach
</div> </div>
<div x-cloak x-show="activeTab === 'scheduled-tasks'"> <div x-cloak x-show="activeTab === 'scheduled-tasks'">

2
scripts/install.sh
View File

@@ -424,7 +424,7 @@ echo -e " - It could take a while based on your server's performance, network sp
echo -e " - Please wait." echo -e " - Please wait."
getAJoke getAJoke
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" >/dev/null 2>&1 bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}"
echo " - Coolify installed successfully." echo " - Coolify installed successfully."
rm -f $ENV_FILE-$DATE rm -f $ENV_FILE-$DATE

17
templates/compose/postiz.yaml
View File

@@ -3,21 +3,30 @@
# slogan: # slogan:
# tags: # tags:
# logo: # logo:
# port: 5000 # port: 4200
services: services:
postiz: postiz:
image: "ghcr.io/gitroomhq/postiz-app:latest" image: "ghcr.io/gitroomhq/postiz-app:latest"
environment: environment:
- SERVICE_FQDN_POSTIZ_5000 - SERVICE_FQDN_POSTIZ_4200
- MAIN_URL=${SERVICE_FQDN_POSTIZ} - MAIN_URL=${SERVICE_FQDN_POSTIZ}
- FRONTEND_URL=${SERVICE_FQDN_POSTIZ} - FRONTEND_URL=${SERVICE_FQDN_POSTIZ}
- NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZ_3000} - NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZAPI_3000}
- JWT_SECRET=${SERVICE_REALBASE64_JWTSECRET} - JWT_SECRET=${SERVICE_REALBASE64_JWTSECRET}
- DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-postiz}?schema=public - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-postiz}?schema=public
- REDIS_URL=redis://redis:6379 - REDIS_URL=redis://redis:6379
- BACKEND_INTERNAL_URL=${SERVICE_FQDN_POSTIZ} - BACKEND_INTERNAL_URL=http://localhost:3000/
- IS_GENERAL=true - IS_GENERAL=true
- CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}
- CLOUDFLARE_ACCESS_KEY=${CLOUDFLARE_ACCESS_KEY}
- CLOUDFLARE_SECRET_ACCESS_KEY=${CLOUDFLARE_SECRET_ACCESS_KEY}
- CLOUDFLARE_BUCKETNAME=${CLOUDFLARE_BUCKETNAME}
- CLOUDFLARE_BUCKET_URL=${CLOUDFLARE_BUCKET_URL}
- CLOUDFLARE_REGION=${CLOUDFLARE_REGION}
- RESEND_API_KEY=${RESEND_API_KEY}
- EMAIL_FROM_ADDRESS=${EMAIL_FROM_ADDRESS}
- EMAIL_FROM_NAME=${EMAIL_FROM_NAME}
depends_on: depends_on:
postgres: postgres:
condition: service_healthy condition: service_healthy

4
versions.json
View File

@@ -1,10 +1,10 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.344" "version": "4.0.0-beta.345"
}, },
"nightly": { "nightly": {
"version": "4.0.0-beta.345" "version": "4.0.0-beta.346"
}, },
"helper": { "helper": {
"version": "1.0.1" "version": "1.0.1"