From 3a287ae974e550def10f48b6fea9dc2850d77ba9 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 10 Jan 2024 09:25:04 +0100 Subject: [PATCH 1/6] Update Dockerfile to use serversideup/php:8.2-fpm-nginx image --- docker/dev-ssu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dev-ssu/Dockerfile b/docker/dev-ssu/Dockerfile index 44173ba6b..f6f141271 100644 --- a/docker/dev-ssu/Dockerfile +++ b/docker/dev-ssu/Dockerfile @@ -1,4 +1,4 @@ -FROM serversideup/php:8.2-fpm-nginx-v2.2.0 +FROM serversideup/php:8.2-fpm-nginx ARG TARGETPLATFORM # https://github.com/cloudflare/cloudflared/releases From 225bf0673637a5f9066e25ffcbb803dc211b3d75 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 10 Jan 2024 10:50:07 +0100 Subject: [PATCH 2/6] Update version numbers and remove unused files --- app/Console/Commands/Init.php | 2 +- config/sentry.php | 2 +- config/version.php | 2 +- .../project/application/deployment.blade.php | 5 - .../project/application/deployments.blade.php | 5 - .../project/database/backups/all.blade.php | 22 ----- .../database/backups/executions.blade.php | 19 ---- .../project/database/configuration.blade.php | 82 ---------------- resources/views/project/new.blade.php | 17 ---- resources/views/project/resources.blade.php | 97 ------------------- .../views/settings/configuration.blade.php | 25 ----- resources/views/settings/license.blade.php | 5 - versions.json | 2 +- 13 files changed, 4 insertions(+), 281 deletions(-) delete mode 100644 resources/views/project/application/deployment.blade.php delete mode 100644 resources/views/project/application/deployments.blade.php delete mode 100644 resources/views/project/database/backups/all.blade.php delete mode 100644 resources/views/project/database/backups/executions.blade.php delete mode 100644 resources/views/project/database/configuration.blade.php delete mode 100644 resources/views/project/new.blade.php delete mode 100644 resources/views/project/resources.blade.php delete mode 100644 resources/views/settings/configuration.blade.php delete mode 100644 resources/views/settings/license.blade.php diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php index b0073e1f0..4def34ac6 100644 --- a/app/Console/Commands/Init.php +++ b/app/Console/Commands/Init.php @@ -99,7 +99,7 @@ class Init extends Command return; } try { - Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id&version=$version"); + Http::get("https://undead.coollabs.io/coolify/v4/alive?appId=$id&version=$version"); echo "I am alive!\n"; } catch (\Throwable $e) { echo "Error in alive: {$e->getMessage()}\n"; diff --git a/config/sentry.php b/config/sentry.php index a7bbeb2d0..c771962da 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.184', + 'release' => '4.0.0-beta.185', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index edf3c27d0..836a1000b 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ -

Deployment

- - - diff --git a/resources/views/project/application/deployments.blade.php b/resources/views/project/application/deployments.blade.php deleted file mode 100644 index 46d731653..000000000 --- a/resources/views/project/application/deployments.blade.php +++ /dev/null @@ -1,5 +0,0 @@ - -

Deployments

- - - diff --git a/resources/views/project/database/backups/all.blade.php b/resources/views/project/database/backups/all.blade.php deleted file mode 100644 index 80a2fd816..000000000 --- a/resources/views/project/database/backups/all.blade.php +++ /dev/null @@ -1,22 +0,0 @@ - -

Backups

- - - - - - - - Close - - - - -
-
-

Scheduled Backups

- + Add -
- -
- diff --git a/resources/views/project/database/backups/executions.blade.php b/resources/views/project/database/backups/executions.blade.php deleted file mode 100644 index 8c4625dcd..000000000 --- a/resources/views/project/database/backups/executions.blade.php +++ /dev/null @@ -1,19 +0,0 @@ - -

Backups

- - - - - - - - Close - - - -
- -

Executions

- -
- diff --git a/resources/views/project/database/configuration.blade.php b/resources/views/project/database/configuration.blade.php deleted file mode 100644 index 49fcf5d1c..000000000 --- a/resources/views/project/database/configuration.blade.php +++ /dev/null @@ -1,82 +0,0 @@ - -

Configuration

- - - - - - - - Close - - - -
-
- General - Environment - Variables - Server - - Storages - - Webhooks - - Resource Limits - - Danger Zone - -
-
-
- @if ($database->type() === 'standalone-postgresql') - - @elseif ($database->type() === 'standalone-redis') - - @elseif ($database->type() === 'standalone-mongodb') - - @elseif ($database->type() === 'standalone-mysql') - - @elseif ($database->type() === 'standalone-mariadb') - - @endif -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
- diff --git a/resources/views/project/new.blade.php b/resources/views/project/new.blade.php deleted file mode 100644 index 5b6ee1029..000000000 --- a/resources/views/project/new.blade.php +++ /dev/null @@ -1,17 +0,0 @@ - - @if ($type === 'public') - - @elseif ($type === 'private-gh-app') - - @elseif ($type === 'private-deploy-key') - - @elseif ($type === 'dockerfile') - - @elseif ($type === 'docker-compose-empty') - - @elseif ($type === 'docker-image') - - @else - - @endif - diff --git a/resources/views/project/resources.blade.php b/resources/views/project/resources.blade.php deleted file mode 100644 index 2b5e6fcd1..000000000 --- a/resources/views/project/resources.blade.php +++ /dev/null @@ -1,97 +0,0 @@ - -
-
-

Resources

- @if ($environment->isEmpty()) - - Clone - - - @else - + - New - - Clone - - @endif -
- -
- @if ($environment->isEmpty()) - + Add New Resource - @endif -
- @foreach ($environment->applications->sortBy('name') as $application) - -
-
{{ $application->name }}
-
{{ $application->description }}
-
- @if (Str::of(data_get($application, 'status'))->startsWith('running')) -
- @elseif (Str::of(data_get($application, 'status'))->startsWith('exited')) -
- @elseif (Str::of(data_get($application, 'status'))->startsWith('restarting')) -
- @endif - - @endforeach - @foreach ($environment->databases()->sortBy('name') as $database) - -
-
{{ $database->name }}
-
{{ $database->description }}
-
- @if (Str::of(data_get($database, 'status'))->startsWith('running')) -
- @elseif (Str::of(data_get($database, 'status'))->startsWith('exited')) -
- @elseif (Str::of(data_get($database, 'status'))->startsWith('restaring')) -
- @endif - - @endforeach - @foreach ($environment->services->sortBy('name') as $service) - -
-
{{ $service->name }}
-
{{ $service->description }}
-
- @if (Str::of(serviceStatus($service))->startsWith('running')) -
- @elseif (Str::of(serviceStatus($service))->startsWith('degraded')) -
- @elseif (Str::of(serviceStatus($service))->startsWith('exited')) -
- @endif - - @endforeach -
- diff --git a/resources/views/settings/configuration.blade.php b/resources/views/settings/configuration.blade.php deleted file mode 100644 index bb17d4a46..000000000 --- a/resources/views/settings/configuration.blade.php +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- General - Instance Backup - Transactional - Email -
-
-
- -
-
- -
-
- -
-
-
- diff --git a/resources/views/settings/license.blade.php b/resources/views/settings/license.blade.php deleted file mode 100644 index 300961f05..000000000 --- a/resources/views/settings/license.blade.php +++ /dev/null @@ -1,5 +0,0 @@ - - -

Resale License

- - diff --git a/versions.json b/versions.json index d96864b76..778016690 100644 --- a/versions.json +++ b/versions.json @@ -4,7 +4,7 @@ "version": "3.12.36" }, "v4": { - "version": "4.0.0-beta.184" + "version": "4.0.0-beta.185" } } } From 76f695036c53ef4bf9568a8566084ef7cb195630 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 10 Jan 2024 10:58:31 +0100 Subject: [PATCH 3/6] fix: static buildpack should set port 80 --- app/Livewire/Project/Application/General.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php index f54a46e09..34e3d7fcd 100644 --- a/app/Livewire/Project/Application/General.php +++ b/app/Livewire/Project/Application/General.php @@ -170,6 +170,10 @@ class General extends Component $this->application->fqdn = null; $this->application->settings->save(); } + if ($this->application->build_pack === 'static') { + $this->application->ports_exposes = $this->ports_exposes = 80; + $this->resetDefaultLabels(false); + } $this->submit(); } public function checkLabelUpdates() From 95d0d72e0d4cc1129cf4d5a2b89265071c36720e Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 10 Jan 2024 11:00:06 +0100 Subject: [PATCH 4/6] Fix application build pack logic --- app/Livewire/Project/Application/General.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php index 34e3d7fcd..deef40e5b 100644 --- a/app/Livewire/Project/Application/General.php +++ b/app/Livewire/Project/Application/General.php @@ -162,9 +162,13 @@ class General extends Component } public function updatedApplicationBuildPack() { + ray($this->application->build_pack); if ($this->application->build_pack !== 'nixpacks') { $this->application->settings->is_static = false; $this->application->settings->save(); + } else { + $this->application->ports_exposes = $this->ports_exposes = 3000; + $this->resetDefaultLabels(false); } if ($this->application->build_pack === 'dockercompose') { $this->application->fqdn = null; From 845fc191d4f11e258d074be3108da269c9263de4 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 10 Jan 2024 11:00:11 +0100 Subject: [PATCH 5/6] Remove ray debug statement in updatedApplicationBuildPack method --- app/Livewire/Project/Application/General.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php index deef40e5b..e6f263c7b 100644 --- a/app/Livewire/Project/Application/General.php +++ b/app/Livewire/Project/Application/General.php @@ -162,7 +162,6 @@ class General extends Component } public function updatedApplicationBuildPack() { - ray($this->application->build_pack); if ($this->application->build_pack !== 'nixpacks') { $this->application->settings->is_static = false; $this->application->settings->save(); From f445a8c312eee79e05d365477e8ae8e512910450 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 10 Jan 2024 11:07:53 +0100 Subject: [PATCH 6/6] fix: update navbar on build_pack change --- .../Project/Application/Configuration.php | 2 ++ app/Livewire/Project/Application/General.php | 1 + .../project/application/configuration.blade.php | 2 +- .../project/application/general.blade.php | 17 +++++++++-------- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/Livewire/Project/Application/Configuration.php b/app/Livewire/Project/Application/Configuration.php index 1bf9e6c3b..b095ab54d 100644 --- a/app/Livewire/Project/Application/Configuration.php +++ b/app/Livewire/Project/Application/Configuration.php @@ -10,6 +10,8 @@ class Configuration extends Component { public Application $application; public $servers; + protected $listeners = ['build_pack_updated' => '$refresh']; + public function mount() { $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first(); diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php index e6f263c7b..b36936628 100644 --- a/app/Livewire/Project/Application/General.php +++ b/app/Livewire/Project/Application/General.php @@ -178,6 +178,7 @@ class General extends Component $this->resetDefaultLabels(false); } $this->submit(); + $this->dispatch('build_pack_updated'); } public function checkLabelUpdates() { diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php index 5d2936649..579f1cac1 100644 --- a/resources/views/livewire/project/application/configuration.blade.php +++ b/resources/views/livewire/project/application/configuration.blade.php @@ -2,7 +2,7 @@

Configuration

-
+
General @if ($application->destination->server->isSwarm()) diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php index 3f6d3984f..6df481e71 100644 --- a/resources/views/livewire/project/application/general.blade.php +++ b/resources/views/livewire/project/application/general.blade.php @@ -16,14 +16,7 @@
- @if ($application->build_pack !== 'dockercompose') -
- - Generate Domain - -
- @endif + @if (!$application->dockerfile && $application->build_pack !== 'dockerimage')
@@ -70,6 +63,14 @@ @endif
@endif + @if ($application->build_pack !== 'dockercompose') +
+ + Generate Domain + +
+ @endif @if ($application->build_pack !== 'dockercompose')

Docker Registry

@if ($application->destination->server->isSwarm())