Merge pull request #1363 from coollabsio/next

v4.0.0-beta.103

app/Console/Commands/Init.php

@@ -7,9 +7,11 @@ use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Service;
 use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
 
 class Init extends Command
 {
@@ -21,8 +23,24 @@ class Init extends Command
         ray()->clearAll();
         $this->cleanup_in_progress_application_deployments();
         $this->cleanup_stucked_resources();
+        // $this->cleanup_ssh();
     }
 
+    private function cleanup_ssh()
+    {
+        try {
+            $files = Storage::allFiles('ssh/keys');
+            foreach ($files as $file) {
+                Storage::delete($file);
+            }
+            $files = Storage::allFiles('ssh/mux');
+            foreach ($files as $file) {
+                Storage::delete($file);
+            }
+        } catch (\Throwable $e) {
+            echo "Error: {$e->getMessage()}\n";
+        }
+    }
     private function cleanup_in_progress_application_deployments()
     {
         // Cleanup any failed deployments
@@ -37,11 +55,12 @@ class Init extends Command
             echo "Error: {$e->getMessage()}\n";
         }
     }
-    private function cleanup_stucked_resources() {
+    private function cleanup_stucked_resources()
+    {
         // Cleanup any resources that are not attached to any environment or destination or server
         try {
             $applications = Application::all();
-            foreach($applications as $application) {
+            foreach ($applications as $application) {
                 if (!$application->environment) {
                     ray('Application without environment', $application->name);
                     $application->delete();
@@ -52,7 +71,7 @@ class Init extends Command
                 }
             }
             $postgresqls = StandalonePostgresql::all();
-            foreach($postgresqls as $postgresql) {
+            foreach ($postgresqls as $postgresql) {
                 if (!$postgresql->environment) {
                     ray('Postgresql without environment', $postgresql->name);
                     $postgresql->delete();
@@ -63,7 +82,7 @@ class Init extends Command
                 }
             }
             $redis = StandaloneRedis::all();
-            foreach($redis as $redis) {
+            foreach ($redis as $redis) {
                 if (!$redis->environment) {
                     ray('Redis without environment', $redis->name);
                     $redis->delete();
@@ -74,7 +93,7 @@ class Init extends Command
                 }
             }
             $mongodbs = StandaloneMongodb::all();
-            foreach($mongodbs as $mongodb) {
+            foreach ($mongodbs as $mongodb) {
                 if (!$mongodb->environment) {
                     ray('Mongodb without environment', $mongodb->name);
                     $mongodb->delete();
@@ -84,8 +103,30 @@ class Init extends Command
                     $mongodb->delete();
                 }
             }
+            $mysqls = StandaloneMysql::all();
+            foreach ($mysqls as $mysql) {
+                if (!$mysql->environment) {
+                    ray('Mysql without environment', $mysql->name);
+                    $mysql->delete();
+                }
+                if (!$mysql->destination()) {
+                    ray('Mysql without destination', $mysql->name);
+                    $mysql->delete();
+                }
+            }
+            $mariadbs = StandaloneMysql::all();
+            foreach ($mariadbs as $mariadb) {
+                if (!$mariadb->environment) {
+                    ray('Mariadb without environment', $mariadb->name);
+                    $mariadb->delete();
+                }
+                if (!$mariadb->destination()) {
+                    ray('Mariadb without destination', $mariadb->name);
+                    $mariadb->delete();
+                }
+            }
             $services = Service::all();
-            foreach($services as $service) {
+            foreach ($services as $service) {
                 if (!$service->environment) {
                     ray('Service without environment', $service->name);
                     $service->delete();

app/Http/Livewire/Project/Database/BackupExecutions.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Livewire\Project\Database;
 
+use Illuminate\Support\Facades\Storage;
 use Livewire\Component;
 
 class BackupExecutions extends Component
@@ -23,6 +24,29 @@ class BackupExecutions extends Component
         $this->emit('success', 'Backup deleted successfully.');
         $this->emit('refreshBackupExecutions');
     }
+    public function download($exeuctionId)
+    {
+        try {
+            $execution = $this->backup->executions()->where('id', $exeuctionId)->first();
+            if (is_null($execution)) {
+                $this->emit('error', 'Backup execution not found.');
+                return;
+            }
+            $filename = data_get($execution, 'filename');
+            $server = $execution->scheduledDatabaseBackup->database->destination->server;
+            $privateKeyLocation = savePrivateKeyToFs($server);
+            $disk = Storage::build([
+                'driver' => 'sftp',
+                'host' => $server->ip,
+                'port' => $server->port,
+                'username' => $server->user,
+                'privateKey' => $privateKeyLocation,
+            ]);
+            return $disk->download($filename);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
     public function refreshBackupExecutions(): void
     {
         $this->executions = $this->backup->executions;

app/Http/Livewire/Project/Shared/Webhooks.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Livewire\Project\Shared;
+
+use Livewire\Component;
+
+class Webhooks extends Component
+{
+    public $resource;
+    public ?string $deploywebhook = null;
+    public function mount()
+    {
+        $this->deploywebhook = generateDeployWebhook($this->resource);
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.webhooks');
+    }
+}

app/Jobs/ApplicationDeploymentJob.php

@@ -885,14 +885,14 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     private function generate_build_env_variables()
     {
-        $this->build_args = collect(["--build-arg SOURCE_COMMIT={$this->commit}"]);
+        $this->build_args = collect(["--build-arg SOURCE_COMMIT=\"{$this->commit}\""]);
         if ($this->pull_request_id === 0) {
             foreach ($this->application->build_environment_variables as $env) {
-                $this->build_args->push("--build-arg {$env->key}={$env->value}");
+                $this->build_args->push("--build-arg {$env->key}=\"{$env->value}\"");
             }
         } else {
             foreach ($this->application->build_environment_variables_preview as $env) {
-                $this->build_args->push("--build-arg {$env->key}={$env->value}");
+                $this->build_args->push("--build-arg {$env->key}=\"{$env->value}\"");
             }
         }
 

app/Models/ServerSetting.php

@@ -6,10 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class ServerSetting extends Model
 {
-    protected $fillable = [
-        'server_id',
-        'is_usable',
-    ];
+    protected $guarded = [];
 
     public function server()
     {

app/Providers/RouteServiceProvider.php

@@ -48,7 +48,7 @@ class RouteServiceProvider extends ServiceProvider
             if ($request->path() === 'api/health') {
                 return Limit::perMinute(1000)->by($request->user()?->id ?: $request->ip());
             }
-            return Limit::perMinute(30)->by($request->user()?->id ?: $request->ip());
+            return Limit::perMinute(200)->by($request->user()?->id ?: $request->ip());
         });
         RateLimiter::for('5', function (Request $request) {
             return Limit::perMinute(5)->by($request->user()?->id ?: $request->ip());

bootstrap/helpers/shared.php

@@ -4,7 +4,9 @@ use App\Models\Application;
 use App\Models\InstanceSettings;
 use App\Models\Server;
 use App\Models\Service;
+use App\Models\StandaloneMariadb;
 use App\Models\StandaloneMongodb;
+use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
 use App\Models\Team;
@@ -484,5 +486,18 @@ function queryResourcesByUuid(string $uuid)
     if ($redis) return $redis;
     $mongodb = StandaloneMongodb::whereUuid($uuid)->first();
     if ($mongodb) return $mongodb;
+    $mysql = StandaloneMysql::whereUuid($uuid)->first();
+    if ($mysql) return $mysql;
+    $mariadb = StandaloneMariadb::whereUuid($uuid)->first();
+    if ($mariadb) return $mariadb;
     return $resource;
 }
+
+function generateDeployWebhook($resource) {
+    $baseUrl = base_url();
+    $api = Url::fromString($baseUrl) . '/api/v1';
+    $endpoint = '/deploy';
+    $uuid = data_get($resource, 'uuid');
+    $url = $api . $endpoint . "?uuid=$uuid&force=false";
+    return $url;
+}

composer.json

@@ -21,6 +21,7 @@
         "laravel/ui": "^4.2",
         "lcobucci/jwt": "^5.0.0",
         "league/flysystem-aws-s3-v3": "^3.0",
+        "league/flysystem-sftp-v3": "^3.0",
         "livewire/livewire": "^v2.12.3",
         "lorisleiva/laravel-actions": "^2.7",
         "masmerise/livewire-toaster": "^1.2",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "de2c45be3f03d43430549d963778dc4a",
+    "content-hash": "21ed976753483557403be75318585442",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -2938,6 +2938,66 @@
             ],
             "time": "2023-08-30T10:23:59+00:00"
         },
+        {
+            "name": "league/flysystem-sftp-v3",
+            "version": "3.16.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/flysystem-sftp-v3.git",
+                "reference": "1ba682def8e87fd7fa00883629553c0200d2e974"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-sftp-v3/zipball/1ba682def8e87fd7fa00883629553c0200d2e974",
+                "reference": "1ba682def8e87fd7fa00883629553c0200d2e974",
+                "shasum": ""
+            },
+            "require": {
+                "league/flysystem": "^3.0.14",
+                "league/mime-type-detection": "^1.0.0",
+                "php": "^8.0.2",
+                "phpseclib/phpseclib": "^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "League\\Flysystem\\PhpseclibV3\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frank de Jonge",
+                    "email": "info@frankdejonge.nl"
+                }
+            ],
+            "description": "SFTP filesystem adapter for Flysystem.",
+            "keywords": [
+                "Flysystem",
+                "file",
+                "files",
+                "filesystem",
+                "sftp"
+            ],
+            "support": {
+                "issues": "https://github.com/thephpleague/flysystem-sftp-v3/issues",
+                "source": "https://github.com/thephpleague/flysystem-sftp-v3/tree/3.16.0"
+            },
+            "funding": [
+                {
+                    "url": "https://ecologi.com/frankdejonge",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/frankdejonge",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-08-30T10:25:05+00:00"
+        },
         {
             "name": "league/mime-type-detection",
             "version": "1.13.0",

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.101',
+    'release' => '4.0.0-beta.103',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.101';
+return '4.0.0-beta.103';

resources/views/livewire/project/database/backup-executions.blade.php

@@ -17,10 +17,10 @@
             <div>Location: {{ data_get($execution, 'filename', 'N/A') }}</div>
             <div class="flex gap-2">
                 <div class="flex-1"></div>
-
-                {{-- @if (data_get($execution, 'status') !== 'failed') --}}
-                {{-- <x-forms.button class="bg-coollabs-100 hover:bg-coollabs" wire:click="download">Download</x-forms.button> --}}
-                {{-- @endif --}}
+                @if (data_get($execution, 'status') === 'success')
+                    <x-forms.button class=" hover:bg-coolgray-400"
+                        wire:click="download({{ data_get($execution, 'id') }})">Download</x-forms.button>
+                @endif
                 <x-forms.button isError onclick="sure({{ data_get($execution, 'id') }})">Delete</x-forms.button>
             </div>
         </form>

resources/views/livewire/project/service/index.blade.php

@@ -4,16 +4,25 @@
     <div class="flex h-full pt-6">
         <div class="flex flex-col items-start gap-4 min-w-fit">
             <a target="_blank" href="{{ $service->documentation() }}">Documentation <x-external-link /></a>
-            <a :class="activeTab === 'service-stack' && 'text-white'" @click.prevent="activeTab = 'service-stack';
-                window.location.hash = 'service-stack'" href="#">Service Stack</a>
-            <a :class="activeTab === 'storages' && 'text-white'" @click.prevent="activeTab = 'storages';
-                window.location.hash = 'storages'" href="#">Storages</a>
+            <a :class="activeTab === 'service-stack' && 'text-white'"
+                @click.prevent="activeTab = 'service-stack';
+                window.location.hash = 'service-stack'"
+                href="#">Service Stack</a>
+            <a :class="activeTab === 'storages' && 'text-white'"
+                @click.prevent="activeTab = 'storages';
+                window.location.hash = 'storages'"
+                href="#">Storages</a>
+            <a :class="activeTab === 'webhooks' && 'text-white'"
+                @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
+            </a>
             <a :class="activeTab === 'environment-variables' && 'text-white'"
                 @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
                 href="#">Environment
                 Variables</a>
-            <a :class="activeTab === 'danger' && 'text-white'" @click.prevent="activeTab = 'danger';
-                window.location.hash = 'danger'" href="#">Danger Zone
+            <a :class="activeTab === 'danger' && 'text-white'"
+                @click.prevent="activeTab = 'danger';
+                window.location.hash = 'danger'"
+                href="#">Danger Zone
             </a>
         </div>
         <div class="w-full pl-8">
@@ -100,7 +109,9 @@
                 @foreach ($databases as $database)
                     <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" />
                 @endforeach
-
+            </div>
+            <div x-cloak x-show="activeTab === 'webhooks'">
+                <livewire:project.shared.webhooks :resource="$service" />
             </div>
             <div x-cloak x-show="activeTab === 'environment-variables'">
                 <div x-cloak x-show="activeTab === 'environment-variables'">

resources/views/livewire/project/shared/webhooks.blade.php

@@ -0,0 +1,10 @@
+<div>
+    <div class="flex items-center gap-2">
+        <h2>Webhooks</h2>
+        <x-helper
+            helper="For more details goto our <a class='text-white underline' href='https://coolify.io/docs/api-endpoints' target='_blank'>docs</a>." />
+    </div>
+    <div>
+        <x-forms.input readonly label="Deploy Webhook (auth required)" id="deploywebhook"></x-forms.input>
+    </div>
+</div>

resources/views/project/application/configuration.blade.php

@@ -19,6 +19,9 @@
             <a :class="activeTab === 'storages' && 'text-white'"
                 @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
             </a>
+            <a :class="activeTab === 'webhooks' && 'text-white'"
+                @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
+            </a>
             @if ($application->git_based())
                 <a :class="activeTab === 'previews' && 'text-white'"
                     @click.prevent="activeTab = 'previews'; window.location.hash = 'previews'" href="#">Preview
@@ -57,6 +60,9 @@
             <div x-cloak x-show="activeTab === 'storages'">
                 <livewire:project.service.storage :resource="$application" />
             </div>
+            <div x-cloak x-show="activeTab === 'webhooks'">
+                <livewire:project.shared.webhooks :resource="$application" />
+            </div>
             <div x-cloak x-show="activeTab === 'previews'">
                 <livewire:project.application.previews :application="$application" />
             </div>

resources/views/project/database/configuration.blade.php

@@ -31,6 +31,9 @@
                 window.location.hash = 'storages'"
                 href="#">Storages
             </a>
+            <a :class="activeTab === 'webhooks' && 'text-white'"
+                @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
+            </a>
             <a :class="activeTab === 'resource-limits' && 'text-white'"
                 @click.prevent="activeTab = 'resource-limits';
                 window.location.hash = 'resource-limits'"
@@ -65,6 +68,9 @@
             <div x-cloak x-show="activeTab === 'storages'">
                 <livewire:project.service.storage :resource="$database" />
             </div>
+            <div x-cloak x-show="activeTab === 'webhooks'">
+                <livewire:project.shared.webhooks :resource="$database" />
+            </div>
             <div x-cloak x-show="activeTab === 'resource-limits'">
                 <livewire:project.shared.resource-limits :resource="$database" />
             </div>

routes/api.php

@@ -1,6 +1,8 @@
 <?php
 
+use App\Actions\Database\StartMariadb;
 use App\Actions\Database\StartMongodb;
+use App\Actions\Database\StartMysql;
 use App\Actions\Database\StartPostgresql;
 use App\Actions\Database\StartRedis;
 use App\Actions\Service\StartService;
@@ -32,7 +34,6 @@ Route::group([
         $teamId = data_get($token, 'team_id');
         $uuid = $request->query->get('uuid');
         $force = $request->query->get('force') ?? false;
-
         if (is_null($teamId)) {
             return response()->json(['error' => 'Invalid token.'], 400);
         }
@@ -50,29 +51,56 @@ Route::group([
                 );
                 return response()->json(['message' => 'Deployment queued.'], 200);
             } else if ($type === 'App\Models\StandalonePostgresql') {
+                if (str($resource->status)->startsWith('running')) {
+                    return response()->json(['message' => 'Database already running.'], 200);
+                }
                 StartPostgresql::run($resource);
                 $resource->update([
                     'started_at' => now(),
                 ]);
                 return response()->json(['message' => 'Database started.'], 200);
             } else if ($type === 'App\Models\StandaloneRedis') {
+                if (str($resource->status)->startsWith('running')) {
+                    return response()->json(['message' => 'Database already running.'], 200);
+                }
                 StartRedis::run($resource);
                 $resource->update([
                     'started_at' => now(),
                 ]);
                 return response()->json(['message' => 'Database started.'], 200);
             } else if ($type === 'App\Models\StandaloneMongodb') {
+                if (str($resource->status)->startsWith('running')) {
+                    return response()->json(['message' => 'Database already running.'], 200);
+                }
                 StartMongodb::run($resource);
                 $resource->update([
                     'started_at' => now(),
                 ]);
                 return response()->json(['message' => 'Database started.'], 200);
-            }else if ($type === 'App\Models\Service') {
+            } else if ($type === 'App\Models\StandaloneMysql') {
+                if (str($resource->status)->startsWith('running')) {
+                    return response()->json(['message' => 'Database already running.'], 200);
+                }
+                StartMysql::run($resource);
+                $resource->update([
+                    'started_at' => now(),
+                ]);
+                return response()->json(['message' => 'Database started.'], 200);
+            } else if ($type === 'App\Models\StandaloneMariadb') {
+                if (str($resource->status)->startsWith('running')) {
+                    return response()->json(['message' => 'Database already running.'], 200);
+                }
+                StartMariadb::run($resource);
+                $resource->update([
+                    'started_at' => now(),
+                ]);
+                return response()->json(['message' => 'Database started.'], 200);
+            } else if ($type === 'App\Models\Service') {
                 StartService::run($resource);
-                return response()->json(['message' => 'Service started.'], 200);
+                return response()->json(['message' => 'Service started. It could take a while, be patient.'], 200);
             }
         }
-        return response()->json(['error' => 'No resource found.'], 404);
+        return response()->json(['error' => "No resource found with {$uuid}."], 404);
     });
 });
 

templates/compose/appsmith.yaml

@@ -14,3 +14,5 @@ services:
       - APPSMITH_SMART_LOOK_ID=
     volumes:
       - stacks-data:/appsmith-stacks
+    healthcheck:
+      test: ["NONE"]

templates/compose/dashboard.yaml

@@ -0,0 +1,16 @@
+# documentation: https://github.com/phntxx/dashboard/wiki/Installation#installation-using-docker
+# slogan: A dashboard. Inspired by SUI, it offers simple customization through JSON-files and a handy search bar to help you browse the internet more efficiently.
+# tags: dashboard, web, search, bookmarks
+
+services:
+  dashboard:
+    image: phntxx/dashboard:latest
+    environment:
+      - SERVICE_FQDN_DASHBOARD
+    volumes:
+      - dashboard-data:/app/data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080"]
+      interval: 2s
+      timeout: 10s
+      retries: 15

templates/compose/emby.yaml

@@ -0,0 +1,21 @@
+# documentation: https://emby.media/support/articles/Home.html
+# slogan: A media server software that allows you to organize, stream, and access your multimedia content effortlessly, making it easy to enjoy your favorite movies, TV shows, music, and more.
+# tags: media, server, movies, tv, music
+
+services:
+  emby:
+    image: lscr.io/linuxserver/emby:latest
+    environment:
+      - SERVICE_FQDN_EMBY
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Madrid
+    volumes:
+      - emby-config:/config
+      - emby-tvshows:/tvshows
+      - emby-movies:/movies
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8096"]
+      interval: 2s
+      timeout: 10s
+      retries: 15

templates/compose/embystat.yaml

@@ -0,0 +1,19 @@
+# documentation: https://github.com/mregni/EmbyStat/wiki/docker
+# slogan: EmyStat is an open-source, self-hosted web analytics tool, designed to provide insight into website traffic and user behavior, of your local Emby deployement, all within your control.
+# tags: media, server, movies, tv, music
+
+services:
+  embystat:
+    image: lscr.io/linuxserver/embystat:latest
+    environment:
+      - SERVICE_FQDN_EMBYSTAT
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Madrid
+    volumes:
+      - embystat-config:/config
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:6555"]
+      interval: 2s
+      timeout: 10s
+      retries: 15

templates/compose/grafana-with-postgresql.yaml

@@ -0,0 +1,40 @@
+# documentation: https://grafana.com/docs/grafana/latest/installation/docker/
+# slogan: Grafana is the open source analytics & monitoring solution for every database.
+# tags: grafana,analytics,monitoring,dashboard
+
+services:
+  grafana:
+    image: grafana/grafana-oss
+    environment:
+      - SERVICE_FQDN_GRAFANA
+      - GF_SERVER_ROOT_URL=${SERVICE_FQDN_GRAFANA}
+      - GF_SERVER_DOMAIN=${SERVICE_FQDN_GRAFANA}
+      - GF_SECURITY_ADMIN_PASSWORD=${SERVICE_PASSWORD_GRAFANA}
+      - GF_DATABASE_TYPE=postgres
+      - GF_DATABASE_HOST=postgresql
+      - GF_DATABASE_USER=$SERVICE_USER_POSTGRES
+      - GF_DATABASE_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - GF_DATABASE_NAME=${POSTGRES_DB:-grafana}
+    volumes:
+      - grafana-data:/var/lib/grafana
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    depends_on:
+      - postgresql
+  postgresql:
+    image: postgres:15-alpine
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=${POSTGRES_DB:-grafana}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+

templates/compose/grafana.yaml

@@ -0,0 +1,19 @@
+# documentation: https://grafana.com/docs/grafana/latest/installation/docker/
+# slogan: Grafana is the open source analytics & monitoring solution for every database.
+# tags: grafana,analytics,monitoring,dashboard
+
+services:
+  grafana:
+    image: grafana/grafana-oss
+    environment:
+      - SERVICE_FQDN_GRAFANA
+      - GF_SERVER_ROOT_URL=${SERVICE_FQDN_GRAFANA}
+      - GF_SERVER_DOMAIN=${SERVICE_FQDN_GRAFANA}
+      - GF_SECURITY_ADMIN_PASSWORD=${SERVICE_PASSWORD_GRAFANA}
+    volumes:
+      - grafana-data:/var/lib/grafana
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
+      interval: 5s
+      timeout: 5s
+      retries: 10

templates/compose/grocy.yaml

@@ -0,0 +1,19 @@
+# documentation: https://github.com/grocy/grocy
+# slogan: Grocy is a self-hosted, web-based household management and grocery list application, designed to simplify your household chores and grocery shopping.
+# tags: groceries, household, management, grocery, shopping
+
+services:
+  grocy:
+    image: lscr.io/linuxserver/grocy:latest
+    environment:
+      - SERVICE_FQDN_GROCY
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Madrid
+    volumes:
+      - grocy-config:/config
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:80"]
+      interval: 2s
+      timeout: 10s
+      retries: 15

templates/compose/n8n-with-postgresql.yaml

@@ -0,0 +1,38 @@
+# documentation: https://docs.n8n.io/hosting/
+# slogan: n8n is an extendable workflow automation tool which enables you to connect anything to everything via its open, fair-code model.
+# tags: n8n,workflow,automation,open,source,low,code
+
+services:
+  n8n:
+    image: docker.n8n.io/n8nio/n8n
+    environment:
+      - SERVICE_FQDN_N8N
+      - N8N_EDITOR_BASE_URL=${SERVICE_FQDN_N8N}
+      - N8N_HOST=${SERVICE_FQDN_N8N}
+      - GENERIC_TIMEZONE="Europe/Berlin"
+      - TZ="Europe/Berlin"
+      - DB_TYPE=postgresdb
+      - DB_POSTGRESDB_DATABASE=${POSTGRES_DB:-umami}
+      - DB_POSTGRESDB_HOST=postgresql
+      - DB_POSTGRESDB_PORT=5432
+      - DB_POSTGRESDB_USER=$SERVICE_USER_POSTGRES
+      - DB_POSTGRESDB_SCHEMA=public
+      - DB_POSTGRESDB_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+    volumes:
+      - n8n-data:/home/node/.n8n
+    depends_on:
+      - postgresql
+  postgresql:
+    image: postgres:15-alpine
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=${POSTGRES_DB:-umami}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+

templates/compose/n8n.yaml

@@ -0,0 +1,15 @@
+# documentation: https://docs.n8n.io/hosting/
+# slogan: n8n is an extendable workflow automation tool which enables you to connect anything to everything via its open, fair-code model.
+# tags: n8n,workflow,automation,open,source,low,code
+
+services:
+  n8n:
+    image: docker.n8n.io/n8nio/n8n
+    environment:
+      - SERVICE_FQDN_N8N
+      - N8N_EDITOR_BASE_URL=${SERVICE_FQDN_N8N}
+      - N8N_HOST=${SERVICE_FQDN_N8N}
+      - GENERIC_TIMEZONE="Europe/Berlin"
+      - TZ="Europe/Berlin"
+    volumes:
+      - n8n-data:/home/node/.n8n

templates/compose/openblocks.yaml

@@ -0,0 +1,27 @@
+# documentation: https://docs.openblocks.dev/self-hosting
+# slogan: OpenBlocks is a self-hosted, open-source, low-code platform for building internal tools.
+# tags: openblocks,low,code,platform,open,source,low,code
+
+services:
+  openblocks:
+    image: openblocksdev/openblocks-ce
+    environment:
+      - SERVICE_FQDN_OPENBLOCKS
+      - REDIS_ENABLED=true
+      - MONGODB_ENABLED=true
+      - API_SERVICE_ENABLED=true
+      - NODE_SERVICE_ENABLED=true
+      - PUID=1000
+      - PGID=1000
+      - MONGODB_URI=mongodb://localhost:27017/openblocks?authSource=admin
+      - REDIS_URL=redis://localhost:6379
+      - JS_EXECUTOR_URI=http://localhost:6060
+      - ENABLE_USER_SIGN_UP=${ENABLE_USER_SIGN_UP:-true}
+      - ENCRYPTION_PASSWORD=$SERVICE_
+    volumes:
+      - openblocks-data:/openblocks-stacks
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
+      interval: 5s
+      timeout: 5s
+      retries: 10

templates/compose/pairdrop.yaml

@@ -1,4 +1,4 @@
-# documentation: https://github.com/schlagmichdoch/PairDrop/blob/master/docs/faq.md
+# documentation: https://github.com/schlagmichdoch/PairDrop
 # slogan: Pairdrop is a self-hosted file sharing and collaboration platform, offering secure file sharing and collaboration capabilities for efficient teamwork.
 # tags: file, sharing, collaboration, teamwork
 

templates/compose/snapdrop.yaml

@@ -1,4 +1,4 @@
-# documentation: https://github.com/RobinLinus/snapdrop/blob/master/docs/faq.md
+# documentation: https://github.com/RobinLinus/snapdrop
 # slogan: A self-hosted file-sharing service for secure and convenient file transfers, whether on a local network or the internet.
 # tags: file, sharing, transfer, local, network, internet
 

templates/compose/wordpress-with-mariadb.yaml

@@ -1,5 +1,5 @@
 # documentation: https://wordpress.org/documentation/
-# slogan: "WordPress is open source software you can use to create a beautiful website, blog, or app."
+# slogan: WordPress with MariaDB. Wordpress is open source software you can use to create a beautiful website, blog, or app.
 # tags: cms, blog, content, management, mariadb
 
 services:

templates/compose/wordpress-with-mysql.yaml

@@ -1,5 +1,5 @@
 # documentation: https://wordpress.org/documentation/
-# slogan: "WordPress is open source software you can use to create a beautiful website, blog, or app."
+# slogan: WordPress with MySQL. Wordpress is open source software you can use to create a beautiful website, blog, or app.
 # tags: cms, blog, content, management, mysql
 
 services:

templates/compose/wordpress-without-database.yaml

@@ -1,5 +1,5 @@
 # documentation: https://wordpress.org/documentation/
-# slogan: "WordPress is open source software you can use to create a beautiful website, blog, or app."
+# slogan: WordPress with external database. Wordpress is open source software you can use to create a beautiful website, blog, or app.
 # tags: cms, blog, content, management
 
 services:

templates/service-templates.json

@@ -2,7 +2,7 @@
     "appsmith": {
         "documentation": "https:\/\/docs.appsmith.com",
         "slogan": "Appsmith is an open-source, self-hosted application development platform that enables you to build powerful web applications with ease.",
-        "compose": "c2VydmljZXM6CiAgYXBwc21pdGg6CiAgICBpbWFnZTogJ2luZGV4LmRvY2tlci5pby9hcHBzbWl0aC9hcHBzbWl0aC1jZTpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE4KICAgICAgLSBBUFBTTUlUSF9NQUlMX0VOQUJMRUQ9ZmFsc2UKICAgICAgLSBBUFBTTUlUSF9ESVNBQkxFX1RFTEVNRVRSWT10cnVlCiAgICAgIC0gQVBQU01JVEhfRElTQUJMRV9JTlRFUkNPTT10cnVlCiAgICAgIC0gQVBQU01JVEhfU0VOVFJZX0RTTj0KICAgICAgLSBBUFBTTUlUSF9TTUFSVF9MT09LX0lEPQogICAgdm9sdW1lczoKICAgICAgLSAnc3RhY2tzLWRhdGE6L2FwcHNtaXRoLXN0YWNrcycK",
+        "compose": "c2VydmljZXM6CiAgYXBwc21pdGg6CiAgICBpbWFnZTogJ2luZGV4LmRvY2tlci5pby9hcHBzbWl0aC9hcHBzbWl0aC1jZTpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE4KICAgICAgLSBBUFBTTUlUSF9NQUlMX0VOQUJMRUQ9ZmFsc2UKICAgICAgLSBBUFBTTUlUSF9ESVNBQkxFX1RFTEVNRVRSWT10cnVlCiAgICAgIC0gQVBQU01JVEhfRElTQUJMRV9JTlRFUkNPTT10cnVlCiAgICAgIC0gQVBQU01JVEhfU0VOVFJZX0RTTj0KICAgICAgLSBBUFBTTUlUSF9TTUFSVF9MT09LX0lEPQogICAgdm9sdW1lczoKICAgICAgLSAnc3RhY2tzLWRhdGE6L2FwcHNtaXRoLXN0YWNrcycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gTk9ORQo=",
         "tags": [
             "lowcode",
             "nocode",
@@ -44,6 +44,17 @@
             "collaboration"
         ]
     },
+    "dashboard": {
+        "documentation": "https:\/\/github.com\/phntxx\/dashboard\/wiki\/Installation#installation-using-docker",
+        "slogan": "A dashboard. Inspired by SUI, it offers simple customization through JSON-files and a handy search bar to help you browse the internet more efficiently.",
+        "compose": "c2VydmljZXM6CiAgZGFzaGJvYXJkOgogICAgaW1hZ2U6ICdwaG50eHgvZGFzaGJvYXJkOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9EQVNIQk9BUkQKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2Rhc2hib2FyZC1kYXRhOi9hcHAvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDo4MDgwJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1Cg==",
+        "tags": [
+            "dashboard",
+            "web",
+            "search",
+            "bookmarks"
+        ]
+    },
     "dokuwiki": {
         "documentation": "https:\/\/www.dokuwiki.org\/faq",
         "slogan": "A lightweight and easy-to-use wiki platform for creating and managing documentation and knowledge bases with simplicity and flexibility.",
@@ -55,6 +66,30 @@
             "base"
         ]
     },
+    "emby": {
+        "documentation": "https:\/\/emby.media\/support\/articles\/Home.html",
+        "slogan": "A media server software that allows you to organize, stream, and access your multimedia content effortlessly, making it easy to enjoy your favorite movies, TV shows, music, and more.",
+        "compose": "c2VydmljZXM6CiAgZW1ieToKICAgIGltYWdlOiAnbHNjci5pby9saW51eHNlcnZlci9lbWJ5OmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9FTUJZCiAgICAgIC0gUFVJRD0xMDAwCiAgICAgIC0gUEdJRD0xMDAwCiAgICAgIC0gVFo9RXVyb3BlL01hZHJpZAogICAgdm9sdW1lczoKICAgICAgLSAnZW1ieS1jb25maWc6L2NvbmZpZycKICAgICAgLSAnZW1ieS10dnNob3dzOi90dnNob3dzJwogICAgICAtICdlbWJ5LW1vdmllczovbW92aWVzJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgwOTYnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUK",
+        "tags": [
+            "media",
+            "server",
+            "movies",
+            "tv",
+            "music"
+        ]
+    },
+    "embystat": {
+        "documentation": "https:\/\/github.com\/mregni\/EmbyStat\/wiki\/docker",
+        "slogan": "EmyStat is an open-source, self-hosted web analytics tool, designed to provide insight into website traffic and user behavior, of your local Emby deployement, all within your control.",
+        "compose": "c2VydmljZXM6CiAgZW1ieXN0YXQ6CiAgICBpbWFnZTogJ2xzY3IuaW8vbGludXhzZXJ2ZXIvZW1ieXN0YXQ6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0VNQllTVEFUCiAgICAgIC0gUFVJRD0xMDAwCiAgICAgIC0gUEdJRD0xMDAwCiAgICAgIC0gVFo9RXVyb3BlL01hZHJpZAogICAgdm9sdW1lczoKICAgICAgLSAnZW1ieXN0YXQtY29uZmlnOi9jb25maWcnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6NjU1NScKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQo=",
+        "tags": [
+            "media",
+            "server",
+            "movies",
+            "tv",
+            "music"
+        ]
+    },
     "fider": {
         "documentation": "https:\/\/fider.io\/doc",
         "slogan": "Fider is an open-source feedback platform for collecting and managing user feedback, helping you prioritize improvements to your products and services.",
@@ -76,6 +111,18 @@
             "system"
         ]
     },
+    "grocy": {
+        "documentation": "https:\/\/github.com\/grocy\/grocy",
+        "slogan": "Grocy is a self-hosted, web-based household management and grocery list application, designed to simplify your household chores and grocery shopping.",
+        "compose": "c2VydmljZXM6CiAgZ3JvY3k6CiAgICBpbWFnZTogJ2xzY3IuaW8vbGludXhzZXJ2ZXIvZ3JvY3k6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0dST0NZCiAgICAgIC0gUFVJRD0xMDAwCiAgICAgIC0gUEdJRD0xMDAwCiAgICAgIC0gVFo9RXVyb3BlL01hZHJpZAogICAgdm9sdW1lczoKICAgICAgLSAnZ3JvY3ktY29uZmlnOi9jb25maWcnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUK",
+        "tags": [
+            "groceries",
+            "household",
+            "management",
+            "grocery",
+            "shopping"
+        ]
+    },
     "heimdall": {
         "documentation": "https:\/\/github.com\/linuxserver\/Heimdall",
         "slogan": "Heimdall is a self-hosted dashboard for managing and organizing your server applications, providing a centralized and efficient interface.",
@@ -110,8 +157,36 @@
             "api"
         ]
     },
+    "n8n-with-postgresql": {
+        "documentation": "https:\/\/docs.n8n.io\/hosting\/",
+        "slogan": "n8n is an extendable workflow automation tool which enables you to connect anything to everything via its open, fair-code model.",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0iRXVyb3BlL0JlcmxpbiInCiAgICAgIC0gJ1RaPSJFdXJvcGUvQmVybGluIicKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi11bWFtaX0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3Jlc3FsCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LXVtYW1pfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiAxMAo=",
+        "tags": [
+            "n8n",
+            "workflow",
+            "automation",
+            "open",
+            "source",
+            "low",
+            "code"
+        ]
+    },
+    "n8n": {
+        "documentation": "https:\/\/docs.n8n.io\/hosting\/",
+        "slogan": "n8n is an extendable workflow automation tool which enables you to connect anything to everything via its open, fair-code model.",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOCiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0iRXVyb3BlL0JlcmxpbiInCiAgICAgIC0gJ1RaPSJFdXJvcGUvQmVybGluIicKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicK",
+        "tags": [
+            "n8n",
+            "workflow",
+            "automation",
+            "open",
+            "source",
+            "low",
+            "code"
+        ]
+    },
     "pairdrop": {
-        "documentation": "https:\/\/github.com\/schlagmichdoch\/PairDrop\/blob\/master\/docs\/faq.md",
+        "documentation": "https:\/\/github.com\/schlagmichdoch\/PairDrop",
         "slogan": "Pairdrop is a self-hosted file sharing and collaboration platform, offering secure file sharing and collaboration capabilities for efficient teamwork.",
         "compose": "c2VydmljZXM6CiAgcGFpcmRyb3A6CiAgICBpbWFnZTogJ2xzY3IuaW8vbGludXhzZXJ2ZXIvcGFpcmRyb3A6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX1BBSVJEUk9QCiAgICAgIC0gUFVJRD0xMDAwCiAgICAgIC0gUEdJRD0xMDAwCiAgICAgIC0gVFo9RXVyb3BlL01hZHJpZAogICAgICAtIERFQlVHX01PREU9ZmFsc2UKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDozMDAwJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1Cg==",
         "tags": [
@@ -122,7 +197,7 @@
         ]
     },
     "snapdrop": {
-        "documentation": "https:\/\/github.com\/RobinLinus\/snapdrop\/blob\/master\/docs\/faq.md",
+        "documentation": "https:\/\/github.com\/RobinLinus\/snapdrop",
         "slogan": "A self-hosted file-sharing service for secure and convenient file transfers, whether on a local network or the internet.",
         "compose": "c2VydmljZXM6CiAgc25hcGRyb3A6CiAgICBpbWFnZTogJ2xzY3IuaW8vbGludXhzZXJ2ZXIvc25hcGRyb3A6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX1NOQVBEUk9QCiAgICAgIC0gUFVJRD0xMDAwCiAgICAgIC0gUEdJRD0xMDAwCiAgICAgIC0gVFo9RXVyb3BlL01hZHJpZAogICAgdm9sdW1lczoKICAgICAgLSAnc25hcGRyb3AtY29uZmlnOi9jb25maWcnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUK",
         "tags": [
@@ -160,7 +235,7 @@
     },
     "wordpress-with-mariadb": {
         "documentation": "https:\/\/wordpress.org\/documentation\/",
-        "slogan": "\"WordPress is open source software you can use to create a beautiful website, blog, or app.\"",
+        "slogan": "WordPress with MariaDB. Wordpress is open source software you can use to create a beautiful website, blog, or app.",
         "compose": "c2VydmljZXM6CiAgd29yZHByZXNzOgogICAgaW1hZ2U6ICd3b3JkcHJlc3M6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAnd29yZHByZXNzLWZpbGVzOi92YXIvd3d3L2h0bWwnCiAgICBlbnZpcm9ubWVudDoKICAgICAgU0VSVklDRV9GUUROOiBudWxsCiAgICAgIFdPUkRQUkVTU19EQl9IT1NUOiBtYXJpYWRiCiAgICAgIFdPUkRQUkVTU19EQl9VU0VSOiAkU0VSVklDRV9VU0VSX1dPUkRQUkVTUwogICAgICBXT1JEUFJFU1NfREJfUEFTU1dPUkQ6ICRTRVJWSUNFX1BBU1NXT1JEX1dPUkRQUkVTUwogICAgICBXT1JEUFJFU1NfREJfTkFNRTogd29yZHByZXNzCiAgICBkZXBlbmRzX29uOgogICAgICAtIG1hcmlhZGIKICBtYXJpYWRiOgogICAgaW1hZ2U6ICdtYXJpYWRiOjExJwogICAgdm9sdW1lczoKICAgICAgLSAnbWFyaWFkYi1kYXRhOi92YXIvbGliL215c3FsJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIE1ZU1FMX1JPT1RfUEFTU1dPUkQ6ICRTRVJWSUNFX1BBU1NXT1JEX1JPT1QKICAgICAgTVlTUUxfREFUQUJBU0U6IHdvcmRwcmVzcwogICAgICBNWVNRTF9VU0VSOiAkU0VSVklDRV9VU0VSX1dPUkRQUkVTUwogICAgICBNWVNRTF9QQVNTV09SRDogJFNFUlZJQ0VfUEFTU1dPUkRfV09SRFBSRVNTCg==",
         "tags": [
             "cms",
@@ -172,7 +247,7 @@
     },
     "wordpress-with-mysql": {
         "documentation": "https:\/\/wordpress.org\/documentation\/",
-        "slogan": "\"WordPress is open source software you can use to create a beautiful website, blog, or app.\"",
+        "slogan": "WordPress with MySQL. Wordpress is open source software you can use to create a beautiful website, blog, or app.",
         "compose": "c2VydmljZXM6CiAgd29yZHByZXNzOgogICAgaW1hZ2U6ICd3b3JkcHJlc3M6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAnd29yZHByZXNzLWZpbGVzOi92YXIvd3d3L2h0bWwnCiAgICBlbnZpcm9ubWVudDoKICAgICAgU0VSVklDRV9GUUROOiBudWxsCiAgICAgIFdPUkRQUkVTU19EQl9IT1NUOiBteXNxbAogICAgICBXT1JEUFJFU1NfREJfVVNFUjogJFNFUlZJQ0VfVVNFUl9XT1JEUFJFU1MKICAgICAgV09SRFBSRVNTX0RCX1BBU1NXT1JEOiAkU0VSVklDRV9QQVNTV09SRF9XT1JEUFJFU1MKICAgICAgV09SRFBSRVNTX0RCX05BTUU6IHdvcmRwcmVzcwogICAgZGVwZW5kc19vbjoKICAgICAgLSBteXNxbAogIG15c3FsOgogICAgaW1hZ2U6ICdteXNxbDo1LjcnCiAgICB2b2x1bWVzOgogICAgICAtICdteXNxbC1kYXRhOi92YXIvbGliL215c3FsJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIE1ZU1FMX1JPT1RfUEFTU1dPUkQ6ICRTRVJWSUNFX1BBU1NXT1JEX1JPT1QKICAgICAgTVlTUUxfREFUQUJBU0U6IHdvcmRwcmVzcwogICAgICBNWVNRTF9VU0VSOiAkU0VSVklDRV9VU0VSX1dPUkRQUkVTUwogICAgICBNWVNRTF9QQVNTV09SRDogJFNFUlZJQ0VfUEFTU1dPUkRfV09SRFBSRVNTCg==",
         "tags": [
             "cms",
@@ -184,7 +259,7 @@
     },
     "wordpress-without-database": {
         "documentation": "https:\/\/wordpress.org\/documentation\/",
-        "slogan": "\"WordPress is open source software you can use to create a beautiful website, blog, or app.\"",
+        "slogan": "WordPress with external database. Wordpress is open source software you can use to create a beautiful website, blog, or app.",
         "compose": "c2VydmljZXM6CiAgd29yZHByZXNzOgogICAgaW1hZ2U6ICd3b3JkcHJlc3M6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAnd29yZHByZXNzLWZpbGVzOi92YXIvd3d3L2h0bWwnCiAgICBlbnZpcm9ubWVudDoKICAgICAgU0VSVklDRV9GUUROOiBudWxsCg==",
         "tags": [
             "cms",

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.101"
+            "version": "4.0.0-beta.103"
         }
     }
 }