Skip to content

Commit 3535dbb

Browse files
andrasbacsaiandrasbacsai
authored
Merge pull request coollabsio#3583 from coollabsio/next
v4.0.0-beta.345
2 parents e83aece + 84b2af5 commit 3535dbb

File tree

7 files changed

+70
-61
lines changed

7 files changed

+70
-61
lines changed

‎config/sentry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// The release version of your application
99
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
10-
'release' => '4.0.0-beta.344',
10+
'release' => '4.0.0-beta.345',
1111
// When left empty or `null` the Laravel environment will be used
1212
'environment' => config('app.env'),
1313

‎config/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?php
22

3-
return '4.0.0-beta.344';
3+
return '4.0.0-beta.345';

‎database/seeders/ProductionSeeder.php

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -65,37 +65,39 @@ public function run(): void
6565
]);
6666
}
6767
// Add Coolify host (localhost) as Server if it doesn't exist
68-
if (Server::find(0) == null && ! isCloud()) {
69-
$server_details = [
70-
'id' => 0,
71-
'name' => 'localhost',
72-
'description' => "This is the server where Coolify is running on. Don't delete this!",
73-
'user' => 'root',
74-
'ip' => 'host.docker.internal',
75-
'team_id' => 0,
76-
'private_key_id' => 0,
77-
];
78-
$server_details['proxy'] = ServerMetadata::from([
79-
'type' => ProxyTypes::TRAEFIK->value,
80-
'status' => ProxyStatus::EXITED->value,
81-
]);
82-
$server = Server::create($server_details);
83-
$server->settings->is_reachable = true;
84-
$server->settings->is_usable = true;
85-
$server->settings->save();
86-
} else {
87-
$server = Server::find(0);
88-
$server->settings->is_reachable = true;
89-
$server->settings->is_usable = true;
90-
$server->settings->save();
91-
}
92-
if (StandaloneDocker::find(0) == null && ! isCloud()) {
93-
StandaloneDocker::create([
94-
'id' => 0,
95-
'name' => 'localhost-coolify',
96-
'network' => 'coolify',
97-
'server_id' => 0,
98-
]);
68+
if (! isCloud()) {
69+
if (Server::find(0) == null) {
70+
$server_details = [
71+
'id' => 0,
72+
'name' => 'localhost',
73+
'description' => "This is the server where Coolify is running on. Don't delete this!",
74+
'user' => 'root',
75+
'ip' => 'host.docker.internal',
76+
'team_id' => 0,
77+
'private_key_id' => 0,
78+
];
79+
$server_details['proxy'] = ServerMetadata::from([
80+
'type' => ProxyTypes::TRAEFIK->value,
81+
'status' => ProxyStatus::EXITED->value,
82+
]);
83+
$server = Server::create($server_details);
84+
$server->settings->is_reachable = true;
85+
$server->settings->is_usable = true;
86+
$server->settings->save();
87+
} else {
88+
$server = Server::find(0);
89+
$server->settings->is_reachable = true;
90+
$server->settings->is_usable = true;
91+
$server->settings->save();
92+
}
93+
if (StandaloneDocker::find(0) == null) {
94+
StandaloneDocker::create([
95+
'id' => 0,
96+
'name' => 'localhost-coolify',
97+
'network' => 'coolify',
98+
'server_id' => 0,
99+
]);
100+
}
99101
}
100102

101103
if (! isCloud() && config('coolify.is_windows_docker_desktop') == false) {
@@ -112,8 +114,8 @@ public function run(): void
112114
}
113115
} else {
114116
if ($coolify_key) {
115-
$coolify_key = Storage::disk('ssh-keys')->get($coolify_key);
116117
$user = str($coolify_key)->before('@')->after('id.');
118+
$coolify_key = Storage::disk('ssh-keys')->get($coolify_key);
117119
PrivateKey::create([
118120
'id' => 0,
119121
'team_id' => 0,

‎resources/views/livewire/project/service/configuration.blade.php

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
@endif
7777
@if ($application->fqdn)
7878
<span class="flex gap-1 text-xs">{{ Str::limit($application->fqdn, 60) }}
79-
<x-modal-input title="Edit Domains">
79+
<x-modal-input title="Edit Domains" :closeOutside="false">
8080
<x-slot:content>
8181
<span class="cursor-pointer">
8282
<svg xmlns="http://www.w3.org/2000/svg"
@@ -107,15 +107,14 @@ class="w-4 h-4 dark:text-warning text-coollabs"
107107
Settings
108108
</a>
109109
@if (str($application->status)->contains('running'))
110-
<x-modal-confirmation
111-
title="Confirm Service Application Restart?"
112-
buttonTitle="Restart"
113-
submitAction="restartApplication({{ $application->id }})"
114-
:actions="['The selected service application will be unavailable during the restart.', 'If the service application is currently in use data could be lost.']"
115-
:confirmWithText="false"
116-
:confirmWithPassword="false"
117-
step2ButtonText="Restart Service Container"
118-
/>
110+
<x-modal-confirmation title="Confirm Service Application Restart?"
111+
buttonTitle="Restart"
112+
submitAction="restartApplication({{ $application->id }})" :actions="[
113+
'The selected service application will be unavailable during the restart.',
114+
'If the service application is currently in use data could be lost.',
115+
]"
116+
:confirmWithText="false" :confirmWithPassword="false"
117+
step2ButtonText="Restart Service Container" />
119118
@endif
120119
</div>
121120
</div>
@@ -155,15 +154,13 @@ class="w-4 h-4 dark:text-warning text-coollabs"
155154
Settings
156155
</a>
157156
@if (str($database->status)->contains('running'))
158-
<x-modal-confirmation
159-
title="Confirm Service Database Restart?"
160-
buttonTitle="Restart"
161-
submitAction="restartDatabase({{ $database->id }})"
162-
:actions="['This service database will be unavailable during the restart.', 'If the service database is currently in use data could be lost.']"
163-
:confirmWithText="false"
164-
:confirmWithPassword="false"
165-
step2ButtonText="Restart Database"
166-
/>
157+
<x-modal-confirmation title="Confirm Service Database Restart?"
158+
buttonTitle="Restart" submitAction="restartDatabase({{ $database->id }})"
159+
:actions="[
160+
'This service database will be unavailable during the restart.',
161+
'If the service database is currently in use data could be lost.',
162+
]" :confirmWithText="false" :confirmWithPassword="false"
163+
step2ButtonText="Restart Database" />
167164
@endif
168165
</div>
169166
</div>
@@ -183,7 +180,8 @@ class="w-4 h-4 dark:text-warning text-coollabs"
183180
lazy />
184181
@endforeach
185182
@foreach ($databases as $database)
186-
<livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" lazy />
183+
<livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database"
184+
lazy />
187185
@endforeach
188186
</div>
189187
<div x-cloak x-show="activeTab === 'scheduled-tasks'">

‎scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ echo -e " - It could take a while based on your server's performance, network sp
424424
echo -e " - Please wait."
425425
getAJoke
426426

427-
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" >/dev/null 2>&1
427+
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}"
428428
echo " - Coolify installed successfully."
429429
rm -f $ENV_FILE-$DATE
430430

‎templates/compose/postiz.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,30 @@
33
# slogan:
44
# tags:
55
# logo:
6-
# port: 5000
6+
# port: 4200
77

88
services:
99
postiz:
1010
image: "ghcr.io/gitroomhq/postiz-app:latest"
1111
environment:
12-
- SERVICE_FQDN_POSTIZ_5000
12+
- SERVICE_FQDN_POSTIZ_4200
1313
- MAIN_URL=${SERVICE_FQDN_POSTIZ}
1414
- FRONTEND_URL=${SERVICE_FQDN_POSTIZ}
15-
- NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZ_3000}
15+
- NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZAPI_3000}
1616
- JWT_SECRET=${SERVICE_REALBASE64_JWTSECRET}
1717
- DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-postiz}?schema=public
1818
- REDIS_URL=redis://redis:6379
19-
- BACKEND_INTERNAL_URL=${SERVICE_FQDN_POSTIZ}
19+
- BACKEND_INTERNAL_URL=http://localhost:3000/
2020
- IS_GENERAL=true
21+
- CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}
22+
- CLOUDFLARE_ACCESS_KEY=${CLOUDFLARE_ACCESS_KEY}
23+
- CLOUDFLARE_SECRET_ACCESS_KEY=${CLOUDFLARE_SECRET_ACCESS_KEY}
24+
- CLOUDFLARE_BUCKETNAME=${CLOUDFLARE_BUCKETNAME}
25+
- CLOUDFLARE_BUCKET_URL=${CLOUDFLARE_BUCKET_URL}
26+
- CLOUDFLARE_REGION=${CLOUDFLARE_REGION}
27+
- RESEND_API_KEY=${RESEND_API_KEY}
28+
- EMAIL_FROM_ADDRESS=${EMAIL_FROM_ADDRESS}
29+
- EMAIL_FROM_NAME=${EMAIL_FROM_NAME}
2130
depends_on:
2231
postgres:
2332
condition: service_healthy

‎versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"coolify": {
33
"v4": {
4-
"version": "4.0.0-beta.344"
4+
"version": "4.0.0-beta.345"
55
},
66
"nightly": {
7-
"version": "4.0.0-beta.345"
7+
"version": "4.0.0-beta.346"
88
},
99
"helper": {
1010
"version": "1.0.1"

0 commit comments

Comments
 (0)