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/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 f54a46e09..b36936628 100644 --- a/app/Livewire/Project/Application/General.php +++ b/app/Livewire/Project/Application/General.php @@ -165,12 +165,20 @@ class General extends Component 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; $this->application->settings->save(); } + if ($this->application->build_pack === 'static') { + $this->application->ports_exposes = $this->ports_exposes = 80; + $this->resetDefaultLabels(false); + } $this->submit(); + $this->dispatch('build_pack_updated'); } public function checkLabelUpdates() { 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 @@ 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()) diff --git a/resources/views/project/application/deployment.blade.php b/resources/views/project/application/deployment.blade.php deleted file mode 100644 index 0ed0d72b5..000000000 --- a/resources/views/project/application/deployment.blade.php +++ /dev/null @@ -1,5 +0,0 @@ - -

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 - - - -
- -
-
- @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 - -
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 @@ - - -
- -
-
- -
-
- -
-
- -
-
-
-
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" } } }