From 95faa1c3ada18510f0ff1d15268cf77880d1d8c1 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 17 Oct 2023 13:28:33 +0200 Subject: [PATCH 1/9] fix: noindex meta tag --- config/sentry.php | 2 +- config/version.php | 2 +- resources/views/layouts/base.blade.php | 1 + versions.json | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index f0fda5f19..b379daf64 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.88', + 'release' => '4.0.0-beta.89', // 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 8de2939a1..0dd08be1f 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ + Coolify @env('local') diff --git a/versions.json b/versions.json index 1a37a7d61..e87e0d588 100644 --- a/versions.json +++ b/versions.json @@ -4,7 +4,7 @@ "version": "3.12.36" }, "v4": { - "version": "4.0.0-beta.88" + "version": "4.0.0-beta.89" } } } From 30af317bd958bbef07ca518fb0a0ca6a1a6b57ca Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 17 Oct 2023 14:04:21 +0200 Subject: [PATCH 2/9] fix: show docker build logs --- app/Actions/Database/StartDatabaseProxy.php | 2 +- app/Jobs/ApplicationDeploymentJob.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Actions/Database/StartDatabaseProxy.php b/app/Actions/Database/StartDatabaseProxy.php index 922099b4c..eccdf1a6a 100644 --- a/app/Actions/Database/StartDatabaseProxy.php +++ b/app/Actions/Database/StartDatabaseProxy.php @@ -87,7 +87,7 @@ class StartDatabaseProxy "echo '{$dockerfile_base64}' | base64 -d > $configuration_dir/Dockerfile", "echo '{$nginxconf_base64}' | base64 -d > $configuration_dir/nginx.conf", "echo '{$dockercompose_base64}' | base64 -d > $configuration_dir/docker-compose.yaml", - "docker compose --project-directory {$configuration_dir} up --build -d >/dev/null", + "docker compose --project-directory {$configuration_dir} up --build -d", ], $database->destination->server); } } diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index ff4228ac5..b784f58c9 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -455,7 +455,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted $this->stop_running_container(); $this->execute_remote_command( ["echo -n 'Starting preview deployment.'"], - [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d >/dev/null"), "hidden" => true], + [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true], ); } @@ -858,7 +858,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf"); { $this->execute_remote_command( ["echo -n 'Starting application (could take a while).'"], - [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d >/dev/null"), "hidden" => true], + [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true], ); } From 60282f7b6c93d0ce7afd68d676182c9898e56fef Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 17 Oct 2023 14:23:07 +0200 Subject: [PATCH 3/9] fix: only include config.json if its exists and a file --- app/Jobs/ApplicationDeploymentJob.php | 10 ++++++++-- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index b784f58c9..09e7c510d 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -73,6 +73,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted private string $serverUser = 'root'; private string $serverUserHomeDir = '/root'; + private string $dockerConfigFileExists = 'NOK'; public $tries = 1; public function __construct(int $application_deployment_queue_id) @@ -165,6 +166,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted // Get user home directory $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server); + ray("test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"); + $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server); try { if ($this->application->dockerfile) { $this->deploy_simple_dockerfile(); @@ -463,7 +466,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted { $pull = "--pull=always"; $helperImage = config('coolify.helper_image'); - $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}"; + if ($this->dockerConfigFileExists === 'OK') { + $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}"; + } else { + $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}"; + } $this->execute_remote_command( [ @@ -830,7 +837,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf"); ] ); } else { - ray("docker build $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"); $this->execute_remote_command([ executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true ]); diff --git a/config/sentry.php b/config/sentry.php index b379daf64..f25e64767 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.89', + 'release' => '4.0.0-beta.90', // 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 0dd08be1f..2b31457bd 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Tue, 17 Oct 2023 14:44:25 +0200 Subject: [PATCH 4/9] service: wordpress --- templates/service-templates.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/templates/service-templates.json b/templates/service-templates.json index feff3cb2b..5b6600104 100644 --- a/templates/service-templates.json +++ b/templates/service-templates.json @@ -29,5 +29,20 @@ "documentation": "https://github.com/louislam/uptime-kuma/wiki", "slogan": "Uptime Kuma is a free, self-hosted monitoring tool for tracking the status and performance of your web services and applications in real-time.", "compose": "c2VydmljZXM6CiAgdXB0aW1lLWt1bWE6CiAgICBpbWFnZTogbG91aXNsYW0vdXB0aW1lLWt1bWE6MQogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROCiAgICB2b2x1bWVzOgogICAgICAtIHVwdGltZS1rdW1hOi9hcHAvZGF0YQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6IFsiQ01ELVNIRUxMIiwgImV4dHJhL2hlYWx0aGNoZWNrIl0KICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQ==" + }, + "wordpress-with-mariadb": { + "documentation": "https://wordpress.org/documentation/", + "slogan": "Wordpress is a free and open-source content management system (CMS) written in PHP and paired with a MySQL or MariaDB database.", + "compose": "c2VydmljZXM6CiAgIHdvcmRwcmVzczoKICAgICBpbWFnZTogd29yZHByZXNzOmxhdGVzdAogICAgIHZvbHVtZXM6CiAgICAgICAtIHdvcmRwcmVzcy1maWxlczovdmFyL3d3dy9odG1sCiAgICAgZW52aXJvbm1lbnQ6CiAgICAgICBTRVJWSUNFX0ZRRE46CiAgICAgICBXT1JEUFJFU1NfREJfSE9TVDogbWFyaWFkYgogICAgICAgV09SRFBSRVNTX0RCX1VTRVI6ICRTRVJWSUNFX1VTRVJfV09SRFBSRVNTCiAgICAgICBXT1JEUFJFU1NfREJfUEFTU1dPUkQ6ICRTRVJWSUNFX1BBU1NXT1JEX1dPUkRQUkVTUwogICAgICAgV09SRFBSRVNTX0RCX05BTUU6IHdvcmRwcmVzcwogICAgIGRlcGVuZHNfb246CiAgICAgICAtIG1hcmlhZGIKCiAgIG1hcmlhZGI6CiAgICAgaW1hZ2U6IG1hcmlhZGI6MTEKICAgICB2b2x1bWVzOgogICAgICAgLSBtYXJpYWRiLWRhdGE6L3Zhci9saWIvbXlzcWwKICAgICBlbnZpcm9ubWVudDoKICAgICAgIE1ZU1FMX1JPT1RfUEFTU1dPUkQ6ICRTRVJWSUNFX1BBU1NXT1JEX1JPT1QKICAgICAgIE1ZU1FMX0RBVEFCQVNFOiB3b3JkcHJlc3MKICAgICAgIE1ZU1FMX1VTRVI6ICRTRVJWSUNFX1VTRVJfV09SRFBSRVNTCiAgICAgICBNWVNRTF9QQVNTV09SRDogJFNFUlZJQ0VfUEFTU1dPUkRfV09SRFBSRVNT" + }, + "wordpress-with-mysql": { + "documentation": "https://wordpress.org/documentation/", + "slogan": "Wordpress with MySQL.", + "compose": "c2VydmljZXM6CiAgIHdvcmRwcmVzczoKICAgICBpbWFnZTogd29yZHByZXNzOmxhdGVzdAogICAgIHZvbHVtZXM6CiAgICAgICAtIHdvcmRwcmVzcy1maWxlczovdmFyL3d3dy9odG1sCiAgICAgZW52aXJvbm1lbnQ6CiAgICAgICBTRVJWSUNFX0ZRRE46CiAgICAgICBXT1JEUFJFU1NfREJfSE9TVDogbXlzcWwKICAgICAgIFdPUkRQUkVTU19EQl9VU0VSOiAkU0VSVklDRV9VU0VSX1dPUkRQUkVTUwogICAgICAgV09SRFBSRVNTX0RCX1BBU1NXT1JEOiAkU0VSVklDRV9QQVNTV09SRF9XT1JEUFJFU1MKICAgICAgIFdPUkRQUkVTU19EQl9OQU1FOiB3b3JkcHJlc3MKICAgICBkZXBlbmRzX29uOgogICAgICAgLSBteXNxbAoKICAgbXlzcWw6CiAgICAgaW1hZ2U6IG15c3FsOjUuNwogICAgIHZvbHVtZXM6CiAgICAgICAtIG15c3FsLWRhdGE6L3Zhci9saWIvbXlzcWwKICAgICBlbnZpcm9ubWVudDoKICAgICAgIE1ZU1FMX1JPT1RfUEFTU1dPUkQ6ICRTRVJWSUNFX1BBU1NXT1JEX1JPT1QKICAgICAgIE1ZU1FMX0RBVEFCQVNFOiB3b3JkcHJlc3MKICAgICAgIE1ZU1FMX1VTRVI6ICRTRVJWSUNFX1VTRVJfV09SRFBSRVNTCiAgICAgICBNWVNRTF9QQVNTV09SRDogJFNFUlZJQ0VfUEFTU1dPUkRfV09SRFBSRVNT" + }, + "wordpress-without-database": { + "documentation": "https://wordpress.org/documentation/", + "slogan": "Wordpress without predefined database.", + "compose": "c2VydmljZXM6CiAgIHdvcmRwcmVzczoKICAgICBpbWFnZTogd29yZHByZXNzOmxhdGVzdAogICAgIHZvbHVtZXM6CiAgICAgICAtIHdvcmRwcmVzcy1maWxlczovdmFyL3d3dy9odG1sCiAgICAgZW52aXJvbm1lbnQ6CiAgICAgICBTRVJWSUNFX0ZRRE46CiAgICA=" } } From be7f2ad9c4e6c99c67a573b866a175fc36e72d85 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 17 Oct 2023 15:34:20 +0200 Subject: [PATCH 5/9] ui: add helper to service domains --- config/sentry.php | 2 +- config/version.php | 2 +- .../views/livewire/project/service/application.blade.php | 4 ++-- versions.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index f25e64767..f6f0a29fd 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.90', + 'release' => '4.0.0-beta.91', // 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 2b31457bd..286da2a79 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ @if ($application->required_fqdn) + id="application.fqdn" helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.

Example
- http://app.coolify.io, https://cloud.coolify.io/dashboard
- http://app.coolify.io/api/v3
- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "> @else + id="application.fqdn" helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.

Example
- http://app.coolify.io, https://cloud.coolify.io/dashboard
- http://app.coolify.io/api/v3
- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "> @endif Date: Tue, 17 Oct 2023 15:40:47 +0200 Subject: [PATCH 6/9] fix: always start proxy if not NONE is selected --- app/Models/Server.php | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/app/Models/Server.php b/app/Models/Server.php index fa8fdbe39..07f975c48 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -193,23 +193,24 @@ class Server extends BaseModel } public function isProxyShouldRun() { - $shouldRun = false; if ($this->proxyType() === ProxyTypes::NONE->value) { return false; } - foreach ($this->applications() as $application) { - if (data_get($application, 'fqdn')) { - $shouldRun = true; - break; - } - } - if ($this->id === 0) { - $settings = InstanceSettings::get(); - if (data_get($settings, 'fqdn')) { - $shouldRun = true; - } - } - return $shouldRun; + // foreach ($this->applications() as $application) { + // if (data_get($application, 'fqdn')) { + // $shouldRun = true; + // break; + // } + // } + // ray($this->services()->get()); + + // if ($this->id === 0) { + // $settings = InstanceSettings::get(); + // if (data_get($settings, 'fqdn')) { + // $shouldRun = true; + // } + // } + return true; } public function isFunctional() { From 6071412986ae028d86f3d9f1430f7428e215e722 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 17 Oct 2023 19:00:23 +0200 Subject: [PATCH 7/9] fix: proxy start process --- app/Actions/Proxy/CheckProxy.php | 35 ++++++++++++++--------- app/Actions/Proxy/StartProxy.php | 2 -- app/Console/Kernel.php | 1 + app/Http/Livewire/Server/Proxy/Deploy.php | 2 +- app/Http/Livewire/Server/Proxy/Status.php | 2 +- app/Jobs/ContainerStatusJob.php | 15 ++++++++-- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 9 files changed, 40 insertions(+), 23 deletions(-) diff --git a/app/Actions/Proxy/CheckProxy.php b/app/Actions/Proxy/CheckProxy.php index 84dc4e955..279fac20e 100644 --- a/app/Actions/Proxy/CheckProxy.php +++ b/app/Actions/Proxy/CheckProxy.php @@ -2,41 +2,50 @@ namespace App\Actions\Proxy; -use App\Enums\ProxyTypes; use App\Models\Server; -use Illuminate\Support\Str; use Lorisleiva\Actions\Concerns\AsAction; -use Spatie\Activitylog\Models\Activity; class CheckProxy { use AsAction; - public function handle(Server $server) + public function handle(Server $server, $fromUI = false) { if (!$server->isProxyShouldRun()) { - throw new \Exception("Proxy should not run"); + if ($fromUI) { + throw new \Exception("Proxy should not run. You selected the Custom Proxy."); + } else { + return false; + } } $status = getContainerStatus($server, 'coolify-proxy'); if ($status === 'running') { $server->proxy->set('status', 'running'); $server->save(); - return 'OK'; + return false; } $ip = $server->ip; if ($server->id === 0) { $ip = 'host.docker.internal'; } - $connection = @fsockopen($ip, '80'); - $connection = @fsockopen($ip, '443'); - $port80 = is_resource($connection) && fclose($connection); - $port443 = is_resource($connection) && fclose($connection); - ray($ip); + $connection80 = @fsockopen($ip, '80'); + $connection443 = @fsockopen($ip, '443'); + $port80 = is_resource($connection80) && fclose($connection80); + $port443 = is_resource($connection443) && fclose($connection443); if ($port80) { - throw new \Exception("Port 80 is in use.
You must stop the process using this port.
Docs: https://coolify.io/docs
Discord: https://coollabs.io/discord"); + if ($fromUI) { + throw new \Exception("Port 80 is in use.
You must stop the process using this port.
Docs: https://coolify.io/docs
Discord: https://coollabs.io/discord"); + } else { + return false; + } } if ($port443) { - throw new \Exception("Port 443 is in use.
You must stop the process using this port.
Docs: https://coolify.io/docs
Discord: https://coollabs.io/discord>"); + if ($fromUI) { + throw new \Exception("Port 443 is in use.
You must stop the process using this port.
Docs: https://coolify.io/docs
Discord: https://coollabs.io/discord"); + } else { + return false; + } } + return true; } } diff --git a/app/Actions/Proxy/StartProxy.php b/app/Actions/Proxy/StartProxy.php index 14b7fefb5..6a6738177 100644 --- a/app/Actions/Proxy/StartProxy.php +++ b/app/Actions/Proxy/StartProxy.php @@ -13,8 +13,6 @@ class StartProxy public function handle(Server $server, bool $async = true): string|Activity { try { - CheckProxy::run($server); - $proxyType = $server->proxyType(); $commands = collect([]); $proxy_path = get_proxy_path(); diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 52bf06ed9..730cf4113 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -28,6 +28,7 @@ class Kernel extends ConsoleKernel // $this->check_scheduled_backups($schedule); $this->check_resources($schedule); $this->cleanup_servers($schedule); + $this->check_scheduled_backups($schedule); } else { $schedule->command('horizon:snapshot')->everyFiveMinutes(); $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer(); diff --git a/app/Http/Livewire/Server/Proxy/Deploy.php b/app/Http/Livewire/Server/Proxy/Deploy.php index 39995e077..7e828b092 100644 --- a/app/Http/Livewire/Server/Proxy/Deploy.php +++ b/app/Http/Livewire/Server/Proxy/Deploy.php @@ -39,7 +39,7 @@ class Deploy extends Component public function checkProxy() { try { - CheckProxy::run($this->server); + CheckProxy::run($this->server, true); $this->emit('startProxyPolling'); $this->emit('proxyChecked'); } catch (\Throwable $e) { diff --git a/app/Http/Livewire/Server/Proxy/Status.php b/app/Http/Livewire/Server/Proxy/Status.php index 90deb1455..8df8f10cd 100644 --- a/app/Http/Livewire/Server/Proxy/Status.php +++ b/app/Http/Livewire/Server/Proxy/Status.php @@ -34,7 +34,7 @@ class Status extends Component } $this->numberOfPolls++; } - CheckProxy::run($this->server); + CheckProxy::run($this->server, true); $this->emit('proxyStatusUpdated'); if ($this->server->proxy->status === 'running') { $this->polling = false; diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php index 4f379ec65..1c8cf1919 100644 --- a/app/Jobs/ContainerStatusJob.php +++ b/app/Jobs/ContainerStatusJob.php @@ -2,6 +2,7 @@ namespace App\Jobs; +use App\Actions\Proxy\CheckProxy; use App\Actions\Proxy\StartProxy; use App\Models\ApplicationPreview; use App\Models\Server; @@ -117,10 +118,18 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted return data_get($value, 'Name') === '/coolify-proxy'; })->first(); if (!$foundProxyContainer) { - if ($this->server->isProxyShouldRun()) { - StartProxy::run($this->server, false); - $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server)); + try { + $shouldStart = CheckProxy::run($this->server); + if ($shouldStart) { + StartProxy::run($this->server, false); + $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server)); + } else { + ray('Proxy could not be started.'); + } + } catch (\Throwable $e) { + ray($e); } + } else { $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status'); $this->server->save(); diff --git a/config/sentry.php b/config/sentry.php index f6f0a29fd..4a096757f 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.91', + 'release' => '4.0.0-beta.92', // 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 286da2a79..d889b7a6c 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Tue, 17 Oct 2023 20:54:26 +0200 Subject: [PATCH 8/9] fix: setup:dev script & contribution guide --- CONTRIBUTION.md | 2 ++ config/sentry.php | 2 +- config/version.php | 2 +- scripts/run | 3 ++- versions.json | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md index 0952e1bd8..b232e303b 100644 --- a/CONTRIBUTION.md +++ b/CONTRIBUTION.md @@ -27,3 +27,5 @@ You can ask for guidance anytime on our You can login your Coolify instance at `localhost:8000` with `test@example.com` and `password`. Your horizon (Laravel scheduler): `localhost:8000/horizon` - Only reachable if you logged in with root user. + +Mails are caught by Mailpit: `localhost:8025` diff --git a/config/sentry.php b/config/sentry.php index 4a096757f..263e642b1 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.92', + 'release' => '4.0.0-beta.93', // 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 d889b7a6c..1b3ce03c5 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Tue, 17 Oct 2023 20:54:54 +0200 Subject: [PATCH 9/9] revert version --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index 263e642b1..4a096757f 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.93', + 'release' => '4.0.0-beta.92', // 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 1b3ce03c5..d889b7a6c 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@