From b49b3bf9b5df53afe9ee986030f652021718c4d1 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Wed, 7 May 2025 23:11:45 +0200 Subject: [PATCH 01/19] v4.0.0-beta.417 (#5784) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(README): add InterviewPal sponsorship link and corresponding SVG icon * chore(versions): update coolify version to 4.0.0-beta.413 and nightly version to 4.0.0-beta.414 in configuration files * fix(terminal): enhance WebSocket client verification with authorized IPs in terminal server * chore(versions): update realtime version to 1.0.8 in versions.json * chore(versions): update realtime version to 1.0.8 in versions.json * chore(docker): update soketi image version to 1.0.8 in production configuration files * chore(versions): update coolify version to 4.0.0-beta.414 and nightly version to 4.0.0-beta.415 in configuration files * fix(ApplicationDeploymentJob): ensure source is an object before checking GitHub app properties * fix(ui): Disable livewire navigate feature (causing spam of setInterval()) * fix(ui): Remove required attribute from image input in service application view * fix(ui): Change application image validation to be nullable in service application view * fix(Server): Correct proxy path formatting for Traefik proxy type * chore(versions): update coolify version to 4.0.0-beta.416 and nightly version to 4.0.0-beta.417 in configuration files; fix links in deployment view * feat(Service): Add functionality to convert between applications and databases in docker-compose based applications fix(ui): Fix service layout refresh on compose change * fix(service): graceful shutdown of old container (#5731) * refactor(Database): streamline container shutdown process and reduce timeout duration * fix(ServerCheck): enhance proxy container check to ensure it is running before proceeding * chore(seeder): update git branch from 'main' to 'v4.x' for multiple examples in ApplicationSeeder * fix(applications): include pull_request_id in deployment queue check to prevent duplicate deployments * refactor(core): streamline container stopping process and reduce timeout duration; update related methods for consistency * fix(database): update label for image input field to improve clarity * feat(migration): add 'is_migrated' and 'custom_type' columns to service_applications and service_databases tables * feat(backup): implement custom database type selection and enhance scheduled backups management * fix(ServerCheck): set default proxy status to 'exited' to handle missing container state * fix(database): reduce container stop timeout from 300 to 30 seconds for improved responsiveness * refactor(database): update DB facade usage for consistency across service files * Update app/Livewire/Project/Service/Database.php Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * refactor(database): enhance application conversion logic and add existence checks for databases and applications * refactor(actions): standardize method naming for network and configuration deletion across application and service classes * refactor(logdrain): consolidate log drain stopping logic to reduce redundancy * refactor(StandaloneMariadb): add type hint for destination method to improve code clarity * refactor(DeleteResourceJob): streamline resource deletion logic and improve conditional checks for database types * refactor(jobs): update middleware to prevent job release after expiration for CleanupInstanceStuffsJob, RestartProxyJob, and ServerCheckJob * fix(ui): system theming for charts (#5740) * chore(deps-dev): bump vite from 6.2.6 to 6.3.4 (#5743) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.6 to 6.3.4. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v6.3.4/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 6.3.4 dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix(dev): mount points?! * fix(dev): proxy mount point * fix(ui): allow adding scheduled backups for non-migrated databases * fix(DatabaseBackupJob): escape PostgreSQL password in backup command (#5759) * fix(ui): correct closing div tag in service index view * Revert "fix(dev): mount points?!" This reverts commit 365bf3cbf0e5aa21a2ccb12fe6ec333b93e404da. * feat(README): add Gozunga and Macarne to sponsors list * refactor(jobs): unify middleware configuration to prevent job release after expiration for DockerCleanupJob and PushServerUpdateJob * chore(versions): update coolify version to 4.0.0-beta.417 and nightly version to 4.0.0-beta.418 * feat(redis): add scheduled cleanup command for Redis keys and enhance cleanup logic --------- Signed-off-by: dependabot[bot] Co-authored-by: Jérémy Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Best Codes <106822363+The-Best-Codes@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: busybox <29630035+busybox11@users.noreply.github.com> --- README.md | 2 ++ app/Console/Commands/CleanupRedis.php | 23 +++++++++++++---------- app/Console/Kernel.php | 1 + app/Jobs/CleanupInstanceStuffsJob.php | 2 +- app/Jobs/DockerCleanupJob.php | 2 +- app/Jobs/PushServerUpdateJob.php | 2 +- app/Jobs/RestartProxyJob.php | 2 +- app/Jobs/ServerCheckJob.php | 2 +- config/constants.php | 2 +- other/nightly/versions.json | 4 ++-- versions.json | 4 ++-- 11 files changed, 26 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 5f583df75..cf3dc21c3 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,8 @@ Thank you so much! * [Tolgee](https://tolgee.io?ref=coolify.io) - The open source localization platform * [CompAI](https://www.trycomp.ai?ref=coolify.io) - Open source compliance automation platform * [GoldenVM](https://billing.goldenvm.com?ref=coolify.io) - Premium virtual machine hosting solutions +* [Gozunga](https://gozunga.com?ref=coolify.io) - Seriously Simple Cloud Infrastructure +* [Macarne](https://macarne.com?ref=coolify.io) - Best IP Transit & Carrier Ethernet Solutions for Simplified Network Connectivity ## Small Sponsors diff --git a/app/Console/Commands/CleanupRedis.php b/app/Console/Commands/CleanupRedis.php index e16a82be4..315d1adc7 100644 --- a/app/Console/Commands/CleanupRedis.php +++ b/app/Console/Commands/CleanupRedis.php @@ -13,17 +13,20 @@ class CleanupRedis extends Command public function handle() { - $prefix = config('database.redis.options.prefix'); - - $keys = Redis::connection()->keys('*:laravel*'); - collect($keys)->each(function ($key) use ($prefix) { + $redis = Redis::connection('horizon'); + $keys = $redis->keys('*'); + $prefix = config('horizon.prefix'); + foreach ($keys as $key) { $keyWithoutPrefix = str_replace($prefix, '', $key); - Redis::connection()->del($keyWithoutPrefix); - }); + $type = $redis->command('type', [$keyWithoutPrefix]); - $queueOverlaps = Redis::connection()->keys('*laravel-queue-overlap*'); - collect($queueOverlaps)->each(function ($key) { - Redis::connection()->del($key); - }); + if ($type === 5) { + $data = $redis->command('hgetall', [$keyWithoutPrefix]); + $status = data_get($data, 'status'); + if ($status === 'completed') { + $redis->command('del', [$keyWithoutPrefix]); + } + } + } } } diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index a6f24aaad..1c5d3e70b 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -51,6 +51,7 @@ class Kernel extends ConsoleKernel } // $this->scheduleInstance->job(new CleanupStaleMultiplexedConnections)->hourly(); + $this->scheduleInstance->command('cleanup:redis')->everyTenMinutes(); if (isDev()) { // Instance Jobs diff --git a/app/Jobs/CleanupInstanceStuffsJob.php b/app/Jobs/CleanupInstanceStuffsJob.php index 60ae58489..53e344daf 100644 --- a/app/Jobs/CleanupInstanceStuffsJob.php +++ b/app/Jobs/CleanupInstanceStuffsJob.php @@ -23,7 +23,7 @@ class CleanupInstanceStuffsJob implements ShouldBeEncrypted, ShouldBeUnique, Sho public function middleware(): array { - return [(new WithoutOverlapping('cleanup-instance-stuffs'))->expireAfter(60)->dontRelease()]; + return [(new WithoutOverlapping('cleanup-instance-stuffs'))->dontRelease()]; } public function handle(): void diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php index 7e246649d..05a4aa8de 100644 --- a/app/Jobs/DockerCleanupJob.php +++ b/app/Jobs/DockerCleanupJob.php @@ -31,7 +31,7 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue public function middleware(): array { - return [(new WithoutOverlapping($this->server->uuid))->expireAfter(600)]; + return [(new WithoutOverlapping($this->server->uuid))->dontRelease()]; } public function __construct(public Server $server, public bool $manualCleanup = false) {} diff --git a/app/Jobs/PushServerUpdateJob.php b/app/Jobs/PushServerUpdateJob.php index 4d40240f9..93b203fcb 100644 --- a/app/Jobs/PushServerUpdateJob.php +++ b/app/Jobs/PushServerUpdateJob.php @@ -71,7 +71,7 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue public function middleware(): array { - return [(new WithoutOverlapping($this->server->uuid))->expireAfter(30)]; + return [(new WithoutOverlapping($this->server->uuid))->dontRelease()]; } public function backoff(): int diff --git a/app/Jobs/RestartProxyJob.php b/app/Jobs/RestartProxyJob.php index a70ca518c..7fc716f70 100644 --- a/app/Jobs/RestartProxyJob.php +++ b/app/Jobs/RestartProxyJob.php @@ -24,7 +24,7 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue public function middleware(): array { - return [(new WithoutOverlapping($this->server->uuid))->expireAfter(60)->dontRelease()]; + return [(new WithoutOverlapping($this->server->uuid))->dontRelease()]; } public function __construct(public Server $server) {} diff --git a/app/Jobs/ServerCheckJob.php b/app/Jobs/ServerCheckJob.php index 611402161..9818d5c6a 100644 --- a/app/Jobs/ServerCheckJob.php +++ b/app/Jobs/ServerCheckJob.php @@ -28,7 +28,7 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue public function middleware(): array { - return [(new WithoutOverlapping($this->server->uuid))->expireAfter(60)->dontRelease()]; + return [(new WithoutOverlapping($this->server->uuid))->dontRelease()]; } public function __construct(public Server $server) {} diff --git a/config/constants.php b/config/constants.php index 9dcac646c..ec6f981ae 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,7 @@ return [ 'coolify' => [ - 'version' => '4.0.0-beta.416', + 'version' => '4.0.0-beta.417', 'helper_version' => '1.0.8', 'realtime_version' => '1.0.8', 'self_hosted' => env('SELF_HOSTED', true), diff --git a/other/nightly/versions.json b/other/nightly/versions.json index 759bea95b..7cd46baab 100644 --- a/other/nightly/versions.json +++ b/other/nightly/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.416" + "version": "4.0.0-beta.417" }, "nightly": { - "version": "4.0.0-beta.417" + "version": "4.0.0-beta.418" }, "helper": { "version": "1.0.8" diff --git a/versions.json b/versions.json index 759bea95b..7cd46baab 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.416" + "version": "4.0.0-beta.417" }, "nightly": { - "version": "4.0.0-beta.417" + "version": "4.0.0-beta.418" }, "helper": { "version": "1.0.8" From 4439520701dd4a529003ffa7e76d20f8eeafa3cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 7 May 2025 21:12:11 +0000 Subject: [PATCH 02/19] docs: update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b508df1f7..2f9fa276f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ All notable changes to this project will be documented in this file. -## [unreleased] +## [4.0.0-beta.416] - 2025-05-05 ### 📚 Documentation +- Update changelog - Update changelog ## [4.0.0-beta.415] - 2025-04-29 From 36328cc7ef8b9f7a80f68cd7b9347e0e533c7714 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Fri, 9 May 2025 08:30:32 +0200 Subject: [PATCH 03/19] v4.0.0-beta.418 (#5793) --- app/Console/Kernel.php | 2 +- config/constants.php | 2 +- other/nightly/versions.json | 4 ++-- resources/views/livewire/project/new/select.blade.php | 2 +- versions.json | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 1c5d3e70b..c03475647 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -51,7 +51,7 @@ class Kernel extends ConsoleKernel } // $this->scheduleInstance->job(new CleanupStaleMultiplexedConnections)->hourly(); - $this->scheduleInstance->command('cleanup:redis')->everyTenMinutes(); + $this->scheduleInstance->command('cleanup:redis')->hourly(); if (isDev()) { // Instance Jobs diff --git a/config/constants.php b/config/constants.php index ec6f981ae..be20736c0 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,7 @@ return [ 'coolify' => [ - 'version' => '4.0.0-beta.417', + 'version' => '4.0.0-beta.418', 'helper_version' => '1.0.8', 'realtime_version' => '1.0.8', 'self_hosted' => env('SELF_HOSTED', true), diff --git a/other/nightly/versions.json b/other/nightly/versions.json index 7cd46baab..106273897 100644 --- a/other/nightly/versions.json +++ b/other/nightly/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.417" + "version": "4.0.0-beta.418" }, "nightly": { - "version": "4.0.0-beta.418" + "version": "4.0.0-beta.419" }, "helper": { "version": "1.0.8" diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php index 45170ebec..4b3bfbe4d 100644 --- a/resources/views/livewire/project/new/select.blade.php +++ b/resources/views/livewire/project/new/select.blade.php @@ -103,7 +103,7 @@ :src='service.logo' x-on:error.window="$event.target.src = service.logo_github_url" onerror="this.onerror=null; this.src=this.getAttribute('data-fallback');" - x-on:error="$event.target.src = 'coolify-logo.svg'" + x-on:error="$event.target.src = '/coolify-logo.svg'" :data-fallback='service.logo_github_url' /> diff --git a/versions.json b/versions.json index 7cd46baab..106273897 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.417" + "version": "4.0.0-beta.418" }, "nightly": { - "version": "4.0.0-beta.418" + "version": "4.0.0-beta.419" }, "helper": { "version": "1.0.8" From fc5138fdef1cdcc97050378a49e5ffdf9d05a883 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 9 May 2025 06:30:55 +0000 Subject: [PATCH 04/19] docs: update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f9fa276f..9fdf59683 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [4.0.0-beta.417] - 2025-05-07 + +### 📚 Documentation + +- Update changelog + ## [4.0.0-beta.416] - 2025-05-05 ### 📚 Documentation From 129dd685df2c6f2a8adcc8bb4ca3d8f2716141c0 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Mon, 12 May 2025 15:02:12 +0200 Subject: [PATCH 05/19] chore(versions): update coolify version to 4.0.0-beta.419 and nightly version to 4.0.0-beta.420 in configuration files --- config/constants.php | 2 +- other/nightly/versions.json | 4 ++-- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/constants.php b/config/constants.php index be20736c0..2e54acade 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,7 @@ return [ 'coolify' => [ - 'version' => '4.0.0-beta.418', + 'version' => '4.0.0-beta.419', 'helper_version' => '1.0.8', 'realtime_version' => '1.0.8', 'self_hosted' => env('SELF_HOSTED', true), diff --git a/other/nightly/versions.json b/other/nightly/versions.json index 106273897..6b41be267 100644 --- a/other/nightly/versions.json +++ b/other/nightly/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.418" + "version": "4.0.0-beta.419" }, "nightly": { - "version": "4.0.0-beta.419" + "version": "4.0.0-beta.420" }, "helper": { "version": "1.0.8" diff --git a/versions.json b/versions.json index 106273897..6b41be267 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.418" + "version": "4.0.0-beta.419" }, "nightly": { - "version": "4.0.0-beta.419" + "version": "4.0.0-beta.420" }, "helper": { "version": "1.0.8" From 88312895f05365df55da7e2f5118826460ed509e Mon Sep 17 00:00:00 2001 From: rahulhaque Date: Tue, 13 May 2025 13:54:37 +0600 Subject: [PATCH 06/19] =?UTF-8?q?Add=20soketi-app-manager=20service=20temp?= =?UTF-8?q?late=20=F0=9F=9A=80=20(#4797)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add soketi-app-manager service template 🚀 * Soketi-app-manager service template auto migration added ⚙ --- public/svgs/soketi-app-manager.svg | 9 +++++++ templates/compose/soketi-app-manager.yaml | 32 +++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 public/svgs/soketi-app-manager.svg create mode 100644 templates/compose/soketi-app-manager.yaml diff --git a/public/svgs/soketi-app-manager.svg b/public/svgs/soketi-app-manager.svg new file mode 100644 index 000000000..a9e31c968 --- /dev/null +++ b/public/svgs/soketi-app-manager.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/templates/compose/soketi-app-manager.yaml b/templates/compose/soketi-app-manager.yaml new file mode 100644 index 000000000..730bce6c6 --- /dev/null +++ b/templates/compose/soketi-app-manager.yaml @@ -0,0 +1,32 @@ +# documentation: https://github.com/rahulhaque/soketi-app-manager-filament +# slogan: Manage soketi websocket server and apps with ease. +# tags: soketi,websockets,app-manager,dashboard +# logo: svgs/soketi-app-manager.svg +# port: 8080 + +services: + soketi-app-manager: + image: ghcr.io/rahulhaque/soketi-app-manager-filament-alpine:latest + environment: + - SERVICE_FQDN_SOKETIAPPMANAGER_8080 + - AUTORUN_ENABLED=true + - AUTORUN_LARAVEL_MIGRATION=${AUTORUN_LARAVEL_MIGRATION:-true} + - APP_DEBUG=${APP_DEBUG:-false} + - APP_URL=$SERVICE_FQDN_SOKETIAPPMANAGER + - APP_KEY=$APP_KEY + - DB_CONNECTION=$DB_CONNECTION + - DB_HOST=$DB_HOST + - DB_PORT=$DB_PORT + - DB_DATABASE=$DB_DATABASE + - DB_USERNAME=$DB_USERNAME + - DB_PASSWORD=$DB_PASSWORD + - PUSHER_HOST=$PUSHER_HOST + - PUSHER_PORT=$PUSHER_PORT + - PUSHER_SCHEME=$PUSHER_SCHEME + - PUSHER_APP_CLUSTER=$PUSHER_APP_CLUSTER + - SOKETI_DB_REDIS_USERNAME=$SOKETI_DB_REDIS_USERNAME + - SOKETI_DB_REDIS_PASSWORD=$SOKETI_DB_REDIS_PASSWORD + - METRICS_HOST=$METRICS_HOST + healthcheck: + test: ["CMD", "php-fpm-healthcheck"] + start_period: 10s \ No newline at end of file From 031225b9f1d0d48e750cdbfb302642c9b986215c Mon Sep 17 00:00:00 2001 From: Neo <54811660+neooriginal@users.noreply.github.com> Date: Tue, 13 May 2025 19:06:09 +1000 Subject: [PATCH 07/19] Update bugsink.yaml (#5178) Co-authored-by: Neo <54811660+Neotastisch@users.noreply.github.com> Co-authored-by: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> --- templates/compose/bugsink.yaml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/templates/compose/bugsink.yaml b/templates/compose/bugsink.yaml index 787852ff8..d9f6787ce 100644 --- a/templates/compose/bugsink.yaml +++ b/templates/compose/bugsink.yaml @@ -32,13 +32,21 @@ services: - SECRET_KEY=$SERVICE_PASSWORD_64_BUGSINK - CREATE_SUPERUSER=admin:$SERVICE_PASSWORD_BUGSINK - SERVICE_FQDN_BUGSINK_8000 - - BASE_URL=$SERVICE_FQDN_BUGSINK_8000 - - DATABASE_URL=mysql://${SERVICE_USER_BUGSINK}:$SERVICE_PASSWORD_BUGSINK@mysql:3306/${MYSQL_DATABASE:-bugsink} + - 'BASE_URL=${SERVICE_FQDN_BUGSINK_8000}' + - 'DATABASE_URL=mysql://${SERVICE_USER_BUGSINK}:$SERVICE_PASSWORD_BUGSINK@mysql:3306/${MYSQL_DATABASE:-bugsink}' + - ALLOWED_HOSTS=${SERVICE_FQDN_BUGSINK_8000} + - 'SECURE_PROXY_SSL_HEADER=HTTP_X_FORWARDED_PROTO,https' + - 'CSRF_TRUSTED_ORIGINS=${SERVICE_FQDN_BUGSINK_8000}' + - USE_X_FORWARDED_HOST=True + - 'GUNICORN_CMD_ARGS=--forwarded-allow-ips="*"' + labels: + - traefik.enable=true + - traefik.http.routers.bugsink.rule=Host(`${SERVICE_FQDN_BUGSINK_8000}`) + - traefik.http.routers.bugsink.entrypoints=websecure + - traefik.http.routers.bugsink.tls=true depends_on: mysql: condition: service_healthy - healthcheck: - test: ["CMD-SHELL", "python -c 'import requests; requests.get(\"http://localhost:8000/\").raise_for_status()'"] - interval: 5s - timeout: 20s - retries: 10 + +volumes: + my-datavolume: From 99530f1e9c9a86b8e1fc3d0b7df32b2845084ee0 Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Tue, 13 May 2025 11:06:34 +0200 Subject: [PATCH 08/19] Add soketi-app-manager configuration and update environment variable syntax - Introduced soketi-app-manager service template with documentation, slogan, and logo. - Updated environment variable definitions in soketi-app-manager.yaml to use parameter expansion for improved error handling. --- templates/compose/soketi-app-manager.yaml | 30 +++++++++++------------ templates/service-templates.json | 14 +++++++++++ 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/templates/compose/soketi-app-manager.yaml b/templates/compose/soketi-app-manager.yaml index 730bce6c6..3c7a98dfc 100644 --- a/templates/compose/soketi-app-manager.yaml +++ b/templates/compose/soketi-app-manager.yaml @@ -12,21 +12,21 @@ services: - AUTORUN_ENABLED=true - AUTORUN_LARAVEL_MIGRATION=${AUTORUN_LARAVEL_MIGRATION:-true} - APP_DEBUG=${APP_DEBUG:-false} - - APP_URL=$SERVICE_FQDN_SOKETIAPPMANAGER - - APP_KEY=$APP_KEY - - DB_CONNECTION=$DB_CONNECTION - - DB_HOST=$DB_HOST - - DB_PORT=$DB_PORT - - DB_DATABASE=$DB_DATABASE - - DB_USERNAME=$DB_USERNAME - - DB_PASSWORD=$DB_PASSWORD - - PUSHER_HOST=$PUSHER_HOST - - PUSHER_PORT=$PUSHER_PORT - - PUSHER_SCHEME=$PUSHER_SCHEME - - PUSHER_APP_CLUSTER=$PUSHER_APP_CLUSTER - - SOKETI_DB_REDIS_USERNAME=$SOKETI_DB_REDIS_USERNAME - - SOKETI_DB_REDIS_PASSWORD=$SOKETI_DB_REDIS_PASSWORD - - METRICS_HOST=$METRICS_HOST + - APP_URL=${SERVICE_FQDN_SOKETIAPPMANAGER:?} + - APP_KEY=${APP_KEY:?} + - DB_CONNECTION=${DB_CONNECTION:?} + - DB_HOST=${DB_HOST:?} + - DB_PORT=${DB_PORT:?} + - DB_DATABASE=${DB_DATABASE:?} + - DB_USERNAME=${DB_USERNAME:?} + - DB_PASSWORD=${DB_PASSWORD:?} + - PUSHER_HOST=${PUSHER_HOST:?} + - PUSHER_PORT=${PUSHER_PORT:?} + - PUSHER_SCHEME=${PUSHER_SCHEME:?} + - PUSHER_APP_CLUSTER=${PUSHER_APP_CLUSTER:?} + - SOKETI_DB_REDIS_USERNAME=${SOKETI_DB_REDIS_USERNAME:?} + - SOKETI_DB_REDIS_PASSWORD=${SOKETI_DB_REDIS_PASSWORD:?} + - METRICS_HOST=${METRICS_HOST:?} healthcheck: test: ["CMD", "php-fpm-healthcheck"] start_period: 10s \ No newline at end of file diff --git a/templates/service-templates.json b/templates/service-templates.json index be30cba5c..76983d7e3 100644 --- a/templates/service-templates.json +++ b/templates/service-templates.json @@ -2800,6 +2800,20 @@ "logo": "svgs/default.webp", "minversion": "0.0.0" }, + "soketi-app-manager": { + "documentation": "https://github.com/rahulhaque/soketi-app-manager-filament?utm_source=coolify.io", + "slogan": "Manage soketi websocket server and apps with ease.", + "compose": "c2VydmljZXM6CiAgc29rZXRpLWFwcC1tYW5hZ2VyOgogICAgaW1hZ2U6ICdnaGNyLmlvL3JhaHVsaGFxdWUvc29rZXRpLWFwcC1tYW5hZ2VyLWZpbGFtZW50LWFscGluZTpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fU09LRVRJQVBQTUFOQUdFUl84MDgwCiAgICAgIC0gQVVUT1JVTl9FTkFCTEVEPXRydWUKICAgICAgLSAnQVVUT1JVTl9MQVJBVkVMX01JR1JBVElPTj0ke0FVVE9SVU5fTEFSQVZFTF9NSUdSQVRJT046LXRydWV9JwogICAgICAtICdBUFBfREVCVUc9JHtBUFBfREVCVUc6LWZhbHNlfScKICAgICAgLSAnQVBQX1VSTD0ke1NFUlZJQ0VfRlFETl9TT0tFVElBUFBNQU5BR0VSOj99JwogICAgICAtICdBUFBfS0VZPSR7QVBQX0tFWTo/fScKICAgICAgLSAnREJfQ09OTkVDVElPTj0ke0RCX0NPTk5FQ1RJT046P30nCiAgICAgIC0gJ0RCX0hPU1Q9JHtEQl9IT1NUOj99JwogICAgICAtICdEQl9QT1JUPSR7REJfUE9SVDo/fScKICAgICAgLSAnREJfREFUQUJBU0U9JHtEQl9EQVRBQkFTRTo/fScKICAgICAgLSAnREJfVVNFUk5BTUU9JHtEQl9VU0VSTkFNRTo/fScKICAgICAgLSAnREJfUEFTU1dPUkQ9JHtEQl9QQVNTV09SRDo/fScKICAgICAgLSAnUFVTSEVSX0hPU1Q9JHtQVVNIRVJfSE9TVDo/fScKICAgICAgLSAnUFVTSEVSX1BPUlQ9JHtQVVNIRVJfUE9SVDo/fScKICAgICAgLSAnUFVTSEVSX1NDSEVNRT0ke1BVU0hFUl9TQ0hFTUU6P30nCiAgICAgIC0gJ1BVU0hFUl9BUFBfQ0xVU1RFUj0ke1BVU0hFUl9BUFBfQ0xVU1RFUjo/fScKICAgICAgLSAnU09LRVRJX0RCX1JFRElTX1VTRVJOQU1FPSR7U09LRVRJX0RCX1JFRElTX1VTRVJOQU1FOj99JwogICAgICAtICdTT0tFVElfREJfUkVESVNfUEFTU1dPUkQ9JHtTT0tFVElfREJfUkVESVNfUEFTU1dPUkQ6P30nCiAgICAgIC0gJ01FVFJJQ1NfSE9TVD0ke01FVFJJQ1NfSE9TVDo/fScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBwaHAtZnBtLWhlYWx0aGNoZWNrCiAgICAgIHN0YXJ0X3BlcmlvZDogMTBzCg==", + "tags": [ + "soketi", + "websockets", + "app-manager", + "dashboard" + ], + "logo": "svgs/soketi-app-manager.svg", + "minversion": "0.0.0", + "port": "8080" + }, "soketi": { "documentation": "https://docs.soketi.app?utm_source=coolify.io", "slogan": "Soketi is your simple, fast, and resilient open-source WebSockets server.", From 8d7e045b8109bd88034bb2a422ed381d520d326b Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Tue, 13 May 2025 11:06:55 +0200 Subject: [PATCH 09/19] Remove Traefik labels from bugsink service configuration in bugsink.yaml --- templates/compose/bugsink.yaml | 5 ----- templates/service-templates.json | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/templates/compose/bugsink.yaml b/templates/compose/bugsink.yaml index d9f6787ce..16696f10d 100644 --- a/templates/compose/bugsink.yaml +++ b/templates/compose/bugsink.yaml @@ -39,11 +39,6 @@ services: - 'CSRF_TRUSTED_ORIGINS=${SERVICE_FQDN_BUGSINK_8000}' - USE_X_FORWARDED_HOST=True - 'GUNICORN_CMD_ARGS=--forwarded-allow-ips="*"' - labels: - - traefik.enable=true - - traefik.http.routers.bugsink.rule=Host(`${SERVICE_FQDN_BUGSINK_8000}`) - - traefik.http.routers.bugsink.entrypoints=websecure - - traefik.http.routers.bugsink.tls=true depends_on: mysql: condition: service_healthy diff --git a/templates/service-templates.json b/templates/service-templates.json index 76983d7e3..7977d03bc 100644 --- a/templates/service-templates.json +++ b/templates/service-templates.json @@ -271,7 +271,7 @@ "bugsink": { "documentation": "https://www.bugsink.com/docs/?utm_source=coolify.io", "slogan": "Self-hosted Error Tracking", - "compose": "c2VydmljZXM6CiAgbXlzcWw6CiAgICBpbWFnZTogJ215c3FsOmxhdGVzdCcKICAgIHJlc3RhcnQ6IHVubGVzcy1zdG9wcGVkCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfUk9PVF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUk9PVH0nCiAgICAgIC0gJ01ZU1FMX0RBVEFCQVNFPSR7TVlTUUxfREFUQUJBU0U6LWJ1Z3Npbmt9JwogICAgICAtICdNWVNRTF9VU0VSPSR7U0VSVklDRV9VU0VSX0JVR1NJTkt9JwogICAgICAtICdNWVNRTF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfQlVHU0lOS30nCiAgICB2b2x1bWVzOgogICAgICAtICdteS1kYXRhdm9sdW1lOi92YXIvbGliL215c3FsJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG15c3FsYWRtaW4KICAgICAgICAtIHBpbmcKICAgICAgICAtICctaCcKICAgICAgICAtIDEyNy4wLjAuMQogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgd2ViOgogICAgaW1hZ2U6IGJ1Z3NpbmsvYnVnc2luawogICAgcmVzdGFydDogdW5sZXNzLXN0b3BwZWQKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFQ1JFVF9LRVk9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfQlVHU0lOSwogICAgICAtICdDUkVBVEVfU1VQRVJVU0VSPWFkbWluOiRTRVJWSUNFX1BBU1NXT1JEX0JVR1NJTksnCiAgICAgIC0gU0VSVklDRV9GUUROX0JVR1NJTktfODAwMAogICAgICAtIEJBU0VfVVJMPSRTRVJWSUNFX0ZRRE5fQlVHU0lOS184MDAwCiAgICAgIC0gJ0RBVEFCQVNFX1VSTD1teXNxbDovLyR7U0VSVklDRV9VU0VSX0JVR1NJTkt9OiRTRVJWSUNFX1BBU1NXT1JEX0JVR1NJTktAbXlzcWw6MzMwNi8ke01ZU1FMX0RBVEFCQVNFOi1idWdzaW5rfScKICAgIGRlcGVuZHNfb246CiAgICAgIG15c3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3B5dGhvbiAtYyAnJ2ltcG9ydCByZXF1ZXN0czsgcmVxdWVzdHMuZ2V0KCJodHRwOi8vbG9jYWxob3N0OjgwMDAvIikucmFpc2VfZm9yX3N0YXR1cygpJycnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK", + "compose": "c2VydmljZXM6CiAgbXlzcWw6CiAgICBpbWFnZTogJ215c3FsOmxhdGVzdCcKICAgIHJlc3RhcnQ6IHVubGVzcy1zdG9wcGVkCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfUk9PVF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUk9PVH0nCiAgICAgIC0gJ01ZU1FMX0RBVEFCQVNFPSR7TVlTUUxfREFUQUJBU0U6LWJ1Z3Npbmt9JwogICAgICAtICdNWVNRTF9VU0VSPSR7U0VSVklDRV9VU0VSX0JVR1NJTkt9JwogICAgICAtICdNWVNRTF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfQlVHU0lOS30nCiAgICB2b2x1bWVzOgogICAgICAtICdteS1kYXRhdm9sdW1lOi92YXIvbGliL215c3FsJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG15c3FsYWRtaW4KICAgICAgICAtIHBpbmcKICAgICAgICAtICctaCcKICAgICAgICAtIDEyNy4wLjAuMQogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgd2ViOgogICAgaW1hZ2U6IGJ1Z3NpbmsvYnVnc2luawogICAgcmVzdGFydDogdW5sZXNzLXN0b3BwZWQKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFQ1JFVF9LRVk9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfQlVHU0lOSwogICAgICAtICdDUkVBVEVfU1VQRVJVU0VSPWFkbWluOiRTRVJWSUNFX1BBU1NXT1JEX0JVR1NJTksnCiAgICAgIC0gU0VSVklDRV9GUUROX0JVR1NJTktfODAwMAogICAgICAtICdCQVNFX1VSTD0ke1NFUlZJQ0VfRlFETl9CVUdTSU5LXzgwMDB9JwogICAgICAtICdEQVRBQkFTRV9VUkw9bXlzcWw6Ly8ke1NFUlZJQ0VfVVNFUl9CVUdTSU5LfTokU0VSVklDRV9QQVNTV09SRF9CVUdTSU5LQG15c3FsOjMzMDYvJHtNWVNRTF9EQVRBQkFTRTotYnVnc2lua30nCiAgICAgIC0gJ0FMTE9XRURfSE9TVFM9JHtTRVJWSUNFX0ZRRE5fQlVHU0lOS184MDAwfScKICAgICAgLSAnU0VDVVJFX1BST1hZX1NTTF9IRUFERVI9SFRUUF9YX0ZPUldBUkRFRF9QUk9UTyxodHRwcycKICAgICAgLSAnQ1NSRl9UUlVTVEVEX09SSUdJTlM9JHtTRVJWSUNFX0ZRRE5fQlVHU0lOS184MDAwfScKICAgICAgLSBVU0VfWF9GT1JXQVJERURfSE9TVD1UcnVlCiAgICAgIC0gJ0dVTklDT1JOX0NNRF9BUkdTPS0tZm9yd2FyZGVkLWFsbG93LWlwcz0iKiInCiAgICBkZXBlbmRzX29uOgogICAgICBteXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQp2b2x1bWVzOgogIG15LWRhdGF2b2x1bWU6IG51bGwK", "tags": [ "python", "error-tracking", From ed739a4caeece7ac28a888d832e4cbf120ce065e Mon Sep 17 00:00:00 2001 From: isak <45620425+itsisak@users.noreply.github.com> Date: Tue, 13 May 2025 11:32:25 +0200 Subject: [PATCH 10/19] Improve ApplicationPullRequestUpdateJob message (#5549) --- app/Jobs/ApplicationPullRequestUpdateJob.php | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/app/Jobs/ApplicationPullRequestUpdateJob.php b/app/Jobs/ApplicationPullRequestUpdateJob.php index ef8e6efb6..57c0d66b2 100755 --- a/app/Jobs/ApplicationPullRequestUpdateJob.php +++ b/app/Jobs/ApplicationPullRequestUpdateJob.php @@ -37,22 +37,23 @@ class ApplicationPullRequestUpdateJob implements ShouldBeEncrypted, ShouldQueue } if ($this->status === ProcessStatus::CLOSED) { $this->delete_comment(); - return; - } elseif ($this->status === ProcessStatus::IN_PROGRESS) { - $this->body = "The preview deployment is in progress. 🟡\n\n"; - } elseif ($this->status === ProcessStatus::FINISHED) { - $this->body = "The preview deployment is ready. 🟢\n\n"; - if ($this->preview->fqdn) { - $this->body .= "[Open Preview]({$this->preview->fqdn}) | "; - } - } elseif ($this->status === ProcessStatus::ERROR) { - $this->body = "The preview deployment failed. 🔴\n\n"; - } - $this->build_logs_url = base_url()."/project/{$this->application->environment->project->uuid}/{$this->application->environment->name}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}"; + } + + $this->body = "**Preview of {$this->application->name}**\n\n"; + $this->body .= match ($this->status) { + ProcessStatus::IN_PROGRESS => "🟡 Deployment in progress", + ProcessStatus::FINISHED => "🟢 Deployment is ready".($this->preview->fqdn ? " | [Open Preview]({$this->preview->fqdn})" : ''), + ProcessStatus::ERROR => "🔴 Deployment failed", + default => '', + }; + + $this->build_logs_url = base_url()."/project/{$this->application->environment->project->uuid}/environment/{$this->application->environment->uuid}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}"; + $this->body .= " | [Open Build Logs]($this->build_logs_url)\n\n"; + + $serverTimezone = $this->application->destination->server->settings->server_timezone ?? 'CET'; + $this->body .= "Last updated at: ".now($serverTimezone)->toDateTimeString()." ($serverTimezone)"; - $this->body .= '[Open Build Logs]('.$this->build_logs_url.")\n\n\n"; - $this->body .= 'Last updated at: '.now()->toDateTimeString().' CET'; if ($this->preview->pull_request_issue_comment_id) { $this->update_comment(); } else { From 23f120ded491d2e4074e3f2b754558f2a94adabd Mon Sep 17 00:00:00 2001 From: Datenschmutz <63157166+Datenschmutz@users.noreply.github.com> Date: Tue, 13 May 2025 11:32:43 +0200 Subject: [PATCH 11/19] Authentik update - 2025.2.4 (#5576) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * template(docker): Update authentik server and worker images to version 2025.2.1 * Update authentik.yaml Update authentik version to 2025.2.2 * update authentik server and worker images to version 2025.2.3 * Update update Authentik version to 2025.2.4 --------- Co-authored-by: 🏔️ Peak <122374094+peaklabs-dev@users.noreply.github.com> --- templates/compose/authentik.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/compose/authentik.yaml b/templates/compose/authentik.yaml index 4947140b9..eacefa7f5 100644 --- a/templates/compose/authentik.yaml +++ b/templates/compose/authentik.yaml @@ -6,7 +6,7 @@ services: authentik-server: - image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2025.2.3} + image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2025.2.4} restart: unless-stopped command: server environment: @@ -35,7 +35,7 @@ services: redis: condition: service_healthy authentik-worker: - image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2025.2.3} + image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2025.2.4} restart: unless-stopped command: worker environment: From d0a59360bf31b44e4db63149bc6678717f6119e4 Mon Sep 17 00:00:00 2001 From: Hendra Manudinata Date: Tue, 13 May 2025 16:33:36 +0700 Subject: [PATCH 12/19] install: Add support for postmarketOS (#5608) postmarketOS is a Linux distributon based on Alpine, targetting mobile devices to extend its lifespan. Coolify has been tested to work with postmarketOS, as long as the device supports running Docker (mostly by modifying kernel configuration). --- scripts/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index bc3b5b084..44c13a41f 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -297,7 +297,7 @@ if [ -z "$LATEST_REALTIME_VERSION" ]; then fi case "$OS_TYPE" in -arch | ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed | almalinux | amzn | alpine) ;; +arch | ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed | almalinux | amzn | alpine | postmarketos) ;; *) echo "This script only supports Debian, Redhat, Arch Linux, Alpine Linux, or SLES based operating systems for now." exit @@ -326,7 +326,7 @@ case "$OS_TYPE" in arch) pacman -Sy --noconfirm --needed curl wget git jq openssl >/dev/null || true ;; -alpine) +alpine | postmarketos) sed -i '/^#.*\/community/s/^#//' /etc/apk/repositories apk update >/dev/null apk add curl wget git jq openssl >/dev/null @@ -388,7 +388,7 @@ if [ "$SSH_DETECTED" = "false" ]; then systemctl enable sshd >/dev/null 2>&1 systemctl start sshd >/dev/null 2>&1 ;; - alpine) + alpine | postmarketos) apk add openssh >/dev/null rc-update add sshd default >/dev/null 2>&1 service sshd start >/dev/null 2>&1 @@ -472,7 +472,7 @@ if ! [ -x "$(command -v docker)" ]; then systemctl start docker >/dev/null 2>&1 systemctl enable docker >/dev/null 2>&1 ;; - "alpine") + "alpine" | "postmarketos") apk add docker docker-cli-compose >/dev/null 2>&1 rc-update add docker default >/dev/null 2>&1 service docker start >/dev/null 2>&1 From cce8db3b8f2f07c6698e131f29443bed39db510b Mon Sep 17 00:00:00 2001 From: JCluzet Date: Tue, 13 May 2025 11:34:58 +0200 Subject: [PATCH 13/19] fix(constants): adding 'fedora-asahi-remix' as a supported OS (#5646) --- bootstrap/helpers/constants.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap/helpers/constants.php b/bootstrap/helpers/constants.php index b568e090c..3fac52ccd 100644 --- a/bootstrap/helpers/constants.php +++ b/bootstrap/helpers/constants.php @@ -47,7 +47,7 @@ const SPECIFIC_SERVICES = [ // Based on /etc/os-release const SUPPORTED_OS = [ 'ubuntu debian raspbian pop', - 'centos fedora rhel ol rocky amzn almalinux', + 'centos fedora rhel ol rocky amzn almalinux fedora-asahi-remix', 'sles opensuse-leap opensuse-tumbleweed', 'arch', 'alpine', From 29a22791d2dafb8523284642d17fbf479a8f417a Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Tue, 13 May 2025 11:35:43 +0200 Subject: [PATCH 14/19] feat(core): add 'postmarketos' to supported OS list --- bootstrap/helpers/constants.php | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap/helpers/constants.php b/bootstrap/helpers/constants.php index 3fac52ccd..d67497e4e 100644 --- a/bootstrap/helpers/constants.php +++ b/bootstrap/helpers/constants.php @@ -51,6 +51,7 @@ const SUPPORTED_OS = [ 'sles opensuse-leap opensuse-tumbleweed', 'arch', 'alpine', + 'postmarketos', ]; const SHARED_VARIABLE_TYPES = ['team', 'project', 'environment']; From dae955a7a24c7fb2765d091e3953dd413fa9131f Mon Sep 17 00:00:00 2001 From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> Date: Tue, 13 May 2025 11:35:54 +0200 Subject: [PATCH 15/19] fix(authentik): update docker-compose configuration for authentik service --- templates/service-templates.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/service-templates.json b/templates/service-templates.json index 7977d03bc..2582be6e5 100644 --- a/templates/service-templates.json +++ b/templates/service-templates.json @@ -144,7 +144,7 @@ "authentik": { "documentation": "https://docs.goauthentik.io/docs/installation/docker-compose?utm_source=coolify.io", "slogan": "An open-source Identity Provider, focused on flexibility and versatility.", - "compose": "c2VydmljZXM6CiAgYXV0aGVudGlrLXNlcnZlcjoKICAgIGltYWdlOiAnZ2hjci5pby9nb2F1dGhlbnRpay9zZXJ2ZXI6JHtBVVRIRU5USUtfVEFHOi0yMDI1LjIuM30nCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgY29tbWFuZDogc2VydmVyCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fQVVUSEVOVElLU0VSVkVSXzkwMDAKICAgICAgLSAnQVVUSEVOVElLX1JFRElTX19IT1NUPSR7UkVESVNfSE9TVDotcmVkaXN9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fSE9TVD0ke1BPU1RHUkVTX0hPU1Q6LXBvc3RncmVzcWx9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX05BTUU9JHtQT1NUR1JFU19EQjotYXV0aGVudGlrfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1NFQ1JFVF9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEXzY0X0FVVEhFTlRJS1NFUlZFUn0nCiAgICAgIC0gJ0FVVEhFTlRJS19FUlJPUl9SRVBPUlRJTkdfX0VOQUJMRUQ9JHtBVVRIRU5USUtfRVJST1JfUkVQT1JUSU5HX19FTkFCTEVEOi10cnVlfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19IT1NUPSR7QVVUSEVOVElLX0VNQUlMX19IT1NUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19QT1JUPSR7QVVUSEVOVElLX0VNQUlMX19QT1JUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19VU0VSTkFNRT0ke0FVVEhFTlRJS19FTUFJTF9fVVNFUk5BTUV9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1BBU1NXT1JEPSR7QVVUSEVOVElLX0VNQUlMX19QQVNTV09SRH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMUz0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMU30nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTD0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVD0ke0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fRlJPTT0ke0FVVEhFTlRJS19FTUFJTF9fRlJPTX0nCiAgICB2b2x1bWVzOgogICAgICAtICcuL21lZGlhOi9tZWRpYScKICAgICAgLSAnLi9jdXN0b20tdGVtcGxhdGVzOi90ZW1wbGF0ZXMnCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIHJlZGlzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgYXV0aGVudGlrLXdvcmtlcjoKICAgIGltYWdlOiAnZ2hjci5pby9nb2F1dGhlbnRpay9zZXJ2ZXI6JHtBVVRIRU5USUtfVEFHOi0yMDI1LjIuM30nCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgY29tbWFuZDogd29ya2VyCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnQVVUSEVOVElLX1JFRElTX19IT1NUPSR7UkVESVNfSE9TVDotcmVkaXN9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fSE9TVD0ke1BPU1RHUkVTX0hPU1Q6LXBvc3RncmVzcWx9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX05BTUU9JHtQT1NUR1JFU19EQjotYXV0aGVudGlrfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1NFQ1JFVF9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEXzY0X0FVVEhFTlRJS1NFUlZFUn0nCiAgICAgIC0gJ0FVVEhFTlRJS19FUlJPUl9SRVBPUlRJTkdfX0VOQUJMRUQ9JHtBVVRIRU5USUtfRVJST1JfUkVQT1JUSU5HX19FTkFCTEVEfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19IT1NUPSR7QVVUSEVOVElLX0VNQUlMX19IT1NUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19QT1JUPSR7QVVUSEVOVElLX0VNQUlMX19QT1JUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19VU0VSTkFNRT0ke0FVVEhFTlRJS19FTUFJTF9fVVNFUk5BTUV9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1BBU1NXT1JEPSR7QVVUSEVOVElLX0VNQUlMX19QQVNTV09SRH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMUz0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMU30nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTD0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVD0ke0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fRlJPTT0ke0FVVEhFTlRJS19FTUFJTF9fRlJPTX0nCiAgICB1c2VyOiByb290CiAgICB2b2x1bWVzOgogICAgICAtICcvdmFyL3J1bi9kb2NrZXIuc29jazovdmFyL3J1bi9kb2NrZXIuc29jaycKICAgICAgLSAnLi9tZWRpYTovbWVkaWEnCiAgICAgIC0gJy4vY2VydHM6L2NlcnRzJwogICAgICAtICcuL2N1c3RvbS10ZW1wbGF0ZXM6L3RlbXBsYXRlcycKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1kICQke1BPU1RHUkVTX0RCfSAtVSAkJHtQT1NUR1JFU19VU0VSfScKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogICAgdm9sdW1lczoKICAgICAgLSAnYXV0aGVudGlrLWRiOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTH0nCiAgICAgIC0gUE9TVEdSRVNfREI9YXV0aGVudGlrCiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOmFscGluZScKICAgIGNvbW1hbmQ6ICctLXNhdmUgNjAgMSAtLWxvZ2xldmVsIHdhcm5pbmcnCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdyZWRpcy1jbGkgcGluZyB8IGdyZXAgUE9ORycKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogICAgdm9sdW1lczoKICAgICAgLSAncmVkaXM6L2RhdGEnCg==", + "compose": "c2VydmljZXM6CiAgYXV0aGVudGlrLXNlcnZlcjoKICAgIGltYWdlOiAnZ2hjci5pby9nb2F1dGhlbnRpay9zZXJ2ZXI6JHtBVVRIRU5USUtfVEFHOi0yMDI1LjIuNH0nCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgY29tbWFuZDogc2VydmVyCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fQVVUSEVOVElLU0VSVkVSXzkwMDAKICAgICAgLSAnQVVUSEVOVElLX1JFRElTX19IT1NUPSR7UkVESVNfSE9TVDotcmVkaXN9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fSE9TVD0ke1BPU1RHUkVTX0hPU1Q6LXBvc3RncmVzcWx9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX05BTUU9JHtQT1NUR1JFU19EQjotYXV0aGVudGlrfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1NFQ1JFVF9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEXzY0X0FVVEhFTlRJS1NFUlZFUn0nCiAgICAgIC0gJ0FVVEhFTlRJS19FUlJPUl9SRVBPUlRJTkdfX0VOQUJMRUQ9JHtBVVRIRU5USUtfRVJST1JfUkVQT1JUSU5HX19FTkFCTEVEOi10cnVlfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19IT1NUPSR7QVVUSEVOVElLX0VNQUlMX19IT1NUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19QT1JUPSR7QVVUSEVOVElLX0VNQUlMX19QT1JUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19VU0VSTkFNRT0ke0FVVEhFTlRJS19FTUFJTF9fVVNFUk5BTUV9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1BBU1NXT1JEPSR7QVVUSEVOVElLX0VNQUlMX19QQVNTV09SRH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMUz0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMU30nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTD0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVD0ke0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fRlJPTT0ke0FVVEhFTlRJS19FTUFJTF9fRlJPTX0nCiAgICB2b2x1bWVzOgogICAgICAtICcuL21lZGlhOi9tZWRpYScKICAgICAgLSAnLi9jdXN0b20tdGVtcGxhdGVzOi90ZW1wbGF0ZXMnCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIHJlZGlzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgYXV0aGVudGlrLXdvcmtlcjoKICAgIGltYWdlOiAnZ2hjci5pby9nb2F1dGhlbnRpay9zZXJ2ZXI6JHtBVVRIRU5USUtfVEFHOi0yMDI1LjIuNH0nCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgY29tbWFuZDogd29ya2VyCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnQVVUSEVOVElLX1JFRElTX19IT1NUPSR7UkVESVNfSE9TVDotcmVkaXN9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fSE9TVD0ke1BPU1RHUkVTX0hPU1Q6LXBvc3RncmVzcWx9JwogICAgICAtICdBVVRIRU5USUtfUE9TVEdSRVNRTF9fVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX05BTUU9JHtQT1NUR1JFU19EQjotYXV0aGVudGlrfScKICAgICAgLSAnQVVUSEVOVElLX1BPU1RHUkVTUUxfX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU1FMfScKICAgICAgLSAnQVVUSEVOVElLX1NFQ1JFVF9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEXzY0X0FVVEhFTlRJS1NFUlZFUn0nCiAgICAgIC0gJ0FVVEhFTlRJS19FUlJPUl9SRVBPUlRJTkdfX0VOQUJMRUQ9JHtBVVRIRU5USUtfRVJST1JfUkVQT1JUSU5HX19FTkFCTEVEfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19IT1NUPSR7QVVUSEVOVElLX0VNQUlMX19IT1NUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19QT1JUPSR7QVVUSEVOVElLX0VNQUlMX19QT1JUfScKICAgICAgLSAnQVVUSEVOVElLX0VNQUlMX19VU0VSTkFNRT0ke0FVVEhFTlRJS19FTUFJTF9fVVNFUk5BTUV9JwogICAgICAtICdBVVRIRU5USUtfRU1BSUxfX1BBU1NXT1JEPSR7QVVUSEVOVElLX0VNQUlMX19QQVNTV09SRH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMUz0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1RMU30nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTD0ke0FVVEhFTlRJS19FTUFJTF9fVVNFX1NTTH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVD0ke0FVVEhFTlRJS19FTUFJTF9fVElNRU9VVH0nCiAgICAgIC0gJ0FVVEhFTlRJS19FTUFJTF9fRlJPTT0ke0FVVEhFTlRJS19FTUFJTF9fRlJPTX0nCiAgICB1c2VyOiByb290CiAgICB2b2x1bWVzOgogICAgICAtICcvdmFyL3J1bi9kb2NrZXIuc29jazovdmFyL3J1bi9kb2NrZXIuc29jaycKICAgICAgLSAnLi9tZWRpYTovbWVkaWEnCiAgICAgIC0gJy4vY2VydHM6L2NlcnRzJwogICAgICAtICcuL2N1c3RvbS10ZW1wbGF0ZXM6L3RlbXBsYXRlcycKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1kICQke1BPU1RHUkVTX0RCfSAtVSAkJHtQT1NUR1JFU19VU0VSfScKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogICAgdm9sdW1lczoKICAgICAgLSAnYXV0aGVudGlrLWRiOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVNRTH0nCiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVNRTH0nCiAgICAgIC0gUE9TVEdSRVNfREI9YXV0aGVudGlrCiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOmFscGluZScKICAgIGNvbW1hbmQ6ICctLXNhdmUgNjAgMSAtLWxvZ2xldmVsIHdhcm5pbmcnCiAgICByZXN0YXJ0OiB1bmxlc3Mtc3RvcHBlZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdyZWRpcy1jbGkgcGluZyB8IGdyZXAgUE9ORycKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogICAgdm9sdW1lczoKICAgICAgLSAncmVkaXM6L2RhdGEnCg==", "tags": [ "identity", "login", From 4d2d6b3a7cfcfae8cc40042a4f5e2a99c1ddb76a Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Tue, 13 May 2025 12:55:18 +0300 Subject: [PATCH 16/19] fix(api): allow nullable destination_uuid (#5683) Allow nullable destination_uuid in upsert_service. --- app/Http/Controllers/Api/ServicesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php index e792779e1..d544f020b 100644 --- a/app/Http/Controllers/Api/ServicesController.php +++ b/app/Http/Controllers/Api/ServicesController.php @@ -631,7 +631,7 @@ class ServicesController extends Controller 'environment_name' => 'string|nullable', 'environment_uuid' => 'string|nullable', 'server_uuid' => 'string|required', - 'destination_uuid' => 'string', + 'destination_uuid' => 'string|nullable', 'name' => 'string|max:255', 'description' => 'string|nullable', 'instant_deploy' => 'boolean', From 8eef6742a787a9768ecbfc3645257d54310f884f Mon Sep 17 00:00:00 2001 From: Noah Streller <65013011+noahstreller@users.noreply.github.com> Date: Tue, 13 May 2025 19:44:19 +0200 Subject: [PATCH 17/19] chore(deps): upgrade logdrain Fluent Bit to 4.0 (#5719) --- app/Actions/Server/StartLogDrain.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Actions/Server/StartLogDrain.php b/app/Actions/Server/StartLogDrain.php index f72f23696..33eadbdfa 100644 --- a/app/Actions/Server/StartLogDrain.php +++ b/app/Actions/Server/StartLogDrain.php @@ -146,7 +146,7 @@ class StartLogDrain $compose = base64_encode(' services: coolify-log-drain: - image: cr.fluentbit.io/fluent/fluent-bit:2.0 + image: cr.fluentbit.io/fluent/fluent-bit:4.0 container_name: coolify-log-drain command: -c /fluent-bit.conf env_file: From ec63678a0a27b7a831354b1777630bba2eeb9336 Mon Sep 17 00:00:00 2001 From: Mohamed Bassem Date: Tue, 13 May 2025 19:01:09 +0100 Subject: [PATCH 18/19] chore(service): Rename hoarder server to karakeep (#5607) --- public/svgs/{hoarder.svg => karakeep.svg} | 0 .../compose/{hoarder.yaml => karakeep.yaml} | 18 ++++++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) rename public/svgs/{hoarder.svg => karakeep.svg} (100%) rename templates/compose/{hoarder.yaml => karakeep.yaml} (72%) diff --git a/public/svgs/hoarder.svg b/public/svgs/karakeep.svg similarity index 100% rename from public/svgs/hoarder.svg rename to public/svgs/karakeep.svg diff --git a/templates/compose/hoarder.yaml b/templates/compose/karakeep.yaml similarity index 72% rename from templates/compose/hoarder.yaml rename to templates/compose/karakeep.yaml index 4ce1c433f..94b459561 100644 --- a/templates/compose/hoarder.yaml +++ b/templates/compose/karakeep.yaml @@ -1,19 +1,19 @@ -# documentation: https://docs.hoarder.app/ +# documentation: https://docs.karakeep.app/ # slogan: an open source "Bookmark Everything" app that uses AI for automatically tagging the content you throw at it. # tags: media,read-it-later,pocket-alternative,omnivore-alternative,instapaper-alternative -# logo: svgs/hoarder.svg +# logo: svgs/karakeep.svg # port: 3000 services: web: - image: ghcr.io/hoarder-app/hoarder:release + image: ghcr.io/karakeep-app/karakeep:release volumes: - - hoarder-data:/data + - karakeep-data:/data environment: - - SERVICE_FQDN_HOARDER - - NEXTAUTH_SECRET=${SERVICE_PASSWORD_HOARDERNEXTAUTH} + - SERVICE_FQDN_KARAKEEP + - NEXTAUTH_SECRET=${SERVICE_PASSWORD_KARAKEEPNEXTAUTH} - MEILI_MASTER_KEY=${SERVICE_PASSWORD_MEILI} - - NEXTAUTH_URL=${SERVICE_FQDN_HOARDER} + - NEXTAUTH_URL=${SERVICE_FQDN_KARAKEEP} - MEILI_ADDR=http://meilisearch:7700 - BROWSER_WEB_URL=http://chrome:9222 - OPENAI_API_KEY=${SERVICE_OPENAI_API_KEY} @@ -34,11 +34,9 @@ services: image: getmeili/meilisearch:v1.6 environment: - MEILI_NO_ANALYTICS=${MEILI_NO_ANALYTICS:-true} - - NEXTAUTH_SECRET=${SERVICE_PASSWORD_HOARDERNEXTAUTH} - MEILI_MASTER_KEY=${SERVICE_PASSWORD_MEILI} - - NEXTAUTH_URL=${SERVICE_FQDN_HOARDER} volumes: - - hoarder-meilisearch:/meili_data + - karakeep-meilisearch:/meili_data healthcheck: test: ["CMD", "curl", "-f", "http://127.0.0.1:7700/health"] interval: 2s From 5a7aa56c0b6fabeb2e1a0bfb8d87577bbd53a443 Mon Sep 17 00:00:00 2001 From: Pujan Modha <109509620+pujan-modha@users.noreply.github.com> Date: Tue, 13 May 2025 23:47:21 +0530 Subject: [PATCH 19/19] chore(service): Update Supabase services (#5708) --- templates/compose/supabase.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/compose/supabase.yaml b/templates/compose/supabase.yaml index 9ec7c1dea..0cb35cbc5 100644 --- a/templates/compose/supabase.yaml +++ b/templates/compose/supabase.yaml @@ -279,7 +279,7 @@ services: config: hide_credentials: true supabase-studio: - image: supabase/studio:20241202-71e5240 + image: supabase/studio:2025.04.21-sha-173cc56 healthcheck: test: [ @@ -318,7 +318,7 @@ services: # NEXT_ANALYTICS_BACKEND_PROVIDER=bigquery - 'OPENAI_API_KEY=${OPENAI_API_KEY}' supabase-db: - image: supabase/postgres:15.8.1.048 + image: supabase/postgres:15.8.1.060 healthcheck: test: pg_isready -U postgres -h 127.0.0.1 interval: 5s @@ -617,7 +617,7 @@ services: - supabase-db-config:/etc/postgresql-custom supabase-analytics: - image: supabase/logflare:1.4.0 + image: supabase/logflare:1.12.0 healthcheck: test: ["CMD", "curl", "http://127.0.0.1:4000/health"] timeout: 5s @@ -913,7 +913,7 @@ services: command: ["--config", "etc/vector/vector.yml"] supabase-rest: - image: postgrest/postgrest:v12.2.0 + image: postgrest/postgrest:v12.2.11 depends_on: supabase-db: # Disable this if you are using an external Postgres database @@ -931,7 +931,7 @@ services: command: "postgrest" exclude_from_hc: true supabase-auth: - image: supabase/gotrue:v2.164.0 + image: supabase/gotrue:v2.171.0 depends_on: supabase-db: # Disable this if you are using an external Postgres database @@ -1022,7 +1022,7 @@ services: realtime-dev: # This container name looks inconsistent but is correct because realtime constructs tenant id by parsing the subdomain - image: supabase/realtime:v2.33.70 + image: supabase/realtime:v2.34.47 container_name: realtime-dev.supabase-realtime depends_on: supabase-db: @@ -1105,7 +1105,7 @@ services: exit 0 supabase-storage: - image: supabase/storage-api:v1.14.6 + image: supabase/storage-api:v1.22.7 depends_on: supabase-db: # Disable this if you are using an external Postgres database @@ -1191,7 +1191,7 @@ services: - ./volumes/storage:/var/lib/storage supabase-meta: - image: supabase/postgres-meta:v0.84.2 + image: supabase/postgres-meta:v0.88.9 depends_on: supabase-db: # Disable this if you are using an external Postgres database @@ -1207,7 +1207,7 @@ services: - PG_META_DB_PASSWORD=${SERVICE_PASSWORD_POSTGRES} supabase-edge-functions: - image: supabase/edge-runtime:v1.65.3 + image: supabase/edge-runtime:v1.67.4 depends_on: supabase-analytics: condition: service_healthy @@ -1351,7 +1351,7 @@ services: - /home/deno/functions/main supabase-supavisor: - image: 'supabase/supavisor:1.1.56' + image: 'supabase/supavisor:2.5.1' healthcheck: test: - CMD