fix: if compose file has more that 6 components, force stop

fix: parser

app/Actions/Service/StopService.php

@@ -19,14 +19,19 @@ class StopService
             ray('Stopping service: '.$service->name);
             $applications = $service->applications()->get();
             foreach ($applications as $application) {
-                instant_remote_process(command: ["docker stop --time=30 {$application->name}-{$service->uuid}"], server: $server, throwError: false);
+                if ($applications->count() < 6) {
+                    instant_remote_process(command: ["docker stop --time=10 {$application->name}-{$service->uuid}"], server: $server, throwError: false);
+                }
                 instant_remote_process(command: ["docker rm {$application->name}-{$service->uuid}"], server: $server, throwError: false);
                 instant_remote_process(command: ["docker rm -f {$application->name}-{$service->uuid}"], server: $server, throwError: false);
                 $application->update(['status' => 'exited']);
             }
             $dbs = $service->databases()->get();
             foreach ($dbs as $db) {
-                instant_remote_process(command: ["docker stop --time=30 {$db->name}-{$service->uuid}"], server: $server, throwError: false);
+                if ($dbs->count() < 6) {
+
+                    instant_remote_process(command: ["docker stop --time=10 {$db->name}-{$service->uuid}"], server: $server, throwError: false);
+                }
                 instant_remote_process(command: ["docker rm {$db->name}-{$service->uuid}"], server: $server, throwError: false);
                 instant_remote_process(command: ["docker rm -f {$db->name}-{$service->uuid}"], server: $server, throwError: false);
                 $db->update(['status' => 'exited']);

app/Livewire/Project/Resource/Create.php

@@ -91,18 +91,16 @@ class Create extends Component
                         $oneClickDotEnvs->each(function ($value) use ($service) {
                             $key = str()->before($value, '=');
                             $value = str(str()->after($value, '='));
-                            $generatedValue = $value;
-                            if ($value->contains('SERVICE_')) {
-                                $command = $value->after('SERVICE_')->beforeLast('_');
-                                $generatedValue = generateEnvValue($command->value(), $service);
+                            if ($value) {
+                                EnvironmentVariable::create([
+                                    'key' => $key,
+                                    'value' => $value,
+                                    'service_id' => $service->id,
+                                    'is_build_time' => false,
+                                    'is_preview' => false,
+                                ]);
                             }
-                            EnvironmentVariable::create([
-                                'key' => $key,
-                                'value' => $generatedValue,
-                                'service_id' => $service->id,
-                                'is_build_time' => false,
-                                'is_preview' => false,
-                            ]);
+
                         });
                     }
                     $service->parse(isNew: true);

bootstrap/helpers/proxy.php

@@ -146,7 +146,6 @@ function generate_default_proxy_configuration(Server $server)
             'coolify.managed=true',
         ];
         $config = [
-            'version' => '3.8',
             'networks' => $array_of_networks->toArray(),
             'services' => [
                 'traefik' => [

templates/compose/activepieces.yaml

@@ -8,6 +8,7 @@ services:
   activepieces:
     image: "ghcr.io/activepieces/activepieces:latest"
     environment:
+      - SERVICE_FQDN_ACTIVEPIECES
       - AP_API_KEY=$SERVICE_PASSWORD_64_APIKEY
       - AP_ENCRYPTION_KEY=$SERVICE_PASSWORD_ENCRYPTIONKEY
       - AP_ENGINE_EXECUTABLE_PATH=dist/packages/engine/main.js

templates/compose/appwrite.env

@@ -3,9 +3,6 @@ _APP_LOCALE=en
 _APP_OPTIONS_ABUSE=enabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=
-_APP_DOMAIN=
-_APP_DOMAIN_TARGET=
-_APP_DOMAIN_FUNCTIONS=
 _APP_CONSOLE_WHITELIST_ROOT=enabled
 _APP_CONSOLE_WHITELIST_EMAILS=
 _APP_CONSOLE_WHITELIST_IPS=
@@ -28,9 +25,6 @@ _APP_REDIS_PASS=
 _APP_DB_HOST=appwrite-mariadb
 _APP_DB_PORT=3306
 _APP_DB_SCHEMA=appwrite
-_APP_DB_USER=$SERVICE_USER_MYSQL
-_APP_DB_PASS=$SERVICE_PASSWORD_MYSQL
-_APP_DB_ROOT_PASS=$SERVICE_PASSWORD_ROOTMYSQL
 _APP_SMTP_HOST=
 _APP_SMTP_PORT=
 _APP_SMTP_SECURE=
@@ -72,7 +66,6 @@ _APP_FUNCTIONS_CPUS=0
 _APP_FUNCTIONS_MEMORY=0
 _APP_FUNCTIONS_MEMORY_SWAP=0
 _APP_FUNCTIONS_RUNTIMES=node-20.0,php-8.2,python-3.11,ruby-3.2
-_APP_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
 _APP_EXECUTOR_HOST=http://appwrite-executor/v1
 _APP_EXECUTOR_RUNTIME_NETWORK=appwrite_runtimes
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=60

templates/compose/appwrite.yaml

@@ -52,8 +52,9 @@ services:
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
+      - _APP_DB_USER=$SERVICE_USER_MARIADB
+      - _APP_DB_PASS=$SERVICE_PASSWORD_MARIADB
+      - _APP_DB_ROOT_PASS=$SERVICE_PASSWORD_MARIADBROOT
       - _APP_SMTP_HOST
       - _APP_SMTP_PORT
       - _APP_SMTP_SECURE
@@ -92,7 +93,7 @@ services:
       - _APP_FUNCTIONS_CPUS
       - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_RUNTIMES
-      - _APP_EXECUTOR_SECRET
+      - _APP_EXECUTOR_SECRET=$SERVICE_PASSWORD_64_APPWRITE
       - _APP_EXECUTOR_HOST
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG
@@ -500,7 +501,7 @@ services:
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
 
   appwrite-worker-usage:
-    image: appwrite/appwrite:1.5.1
+    image: appwrite/appwrite:1.5
     entrypoint: worker-usage
     container_name: appwrite-worker-usage
     <<: *x-logging
@@ -527,7 +528,7 @@ services:
       - _APP_USAGE_AGGREGATION_INTERVAL
 
   appwrite-worker-usage-dump:
-    image: appwrite/appwrite:1.5.1
+    image: appwrite/appwrite:1.5
     entrypoint: worker-usage-dump
     <<: *x-logging
     container_name: appwrite-worker-usage-dump

templates/service-templates.json

@@ -1 +1 @@
-{"activepieces":{"documentation":"https:\/\/www.activepieces.com\/docs\/getting-started\/introduction?utm_source=coolify.io","slogan":"Open source no-code business automation.","compose":"c2VydmljZXM6CiAgYWN0aXZlcGllY2VzOgogICAgaW1hZ2U6ICdnaGNyLmlvL2FjdGl2ZXBpZWNlcy9hY3RpdmVwaWVjZXM6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gQVBfQVBJX0tFWT0kU0VSVklDRV9QQVNTV09SRF82NF9BUElLRVkKICAgICAgLSBBUF9FTkNSWVBUSU9OX0tFWT0kU0VSVklDRV9QQVNTV09SRF9FTkNSWVBUSU9OS0VZCiAgICAgIC0gQVBfRU5HSU5FX0VYRUNVVEFCTEVfUEFUSD1kaXN0L3BhY2thZ2VzL2VuZ2luZS9tYWluLmpzCiAgICAgIC0gQVBfRU5WSVJPTk1FTlQ9cHJvZAogICAgICAtIEFQX0VYRUNVVElPTl9NT0RFPVVOU0FOREJPWEVECiAgICAgIC0gQVBfRlJPTlRFTkRfVVJMPSRTRVJWSUNFX0ZRRE5fQUNUSVZFUElFQ0VTCiAgICAgIC0gQVBfSldUX1NFQ1JFVD0kU0VSVklDRV9QQVNTV09SRF82NF9KV1QKICAgICAgLSBBUF9QT1NUR1JFU19EQVRBQkFTRT1hY3RpdmVwaWVjZXMKICAgICAgLSBBUF9QT1NUR1JFU19IT1NUPXBvc3RncmVzCiAgICAgIC0gQVBfUE9TVEdSRVNfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSBBUF9QT1NUR1JFU19QT1JUPTU0MzIKICAgICAgLSBBUF9QT1NUR1JFU19VU0VSTkFNRT0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gQVBfUkVESVNfSE9TVD1yZWRpcwogICAgICAtIEFQX1JFRElTX1BPUlQ9NjM3OQogICAgICAtIEFQX1NBTkRCT1hfUlVOX1RJTUVfU0VDT05EUz02MDAKICAgICAgLSBBUF9URUxFTUVUUllfRU5BQkxFRD10cnVlCiAgICAgIC0gJ0FQX1RFTVBMQVRFU19TT1VSQ0VfVVJMPWh0dHBzOi8vY2xvdWQuYWN0aXZlcGllY2VzLmNvbS9hcGkvdjEvZmxvdy10ZW1wbGF0ZXMnCiAgICAgIC0gQVBfVFJJR0dFUl9ERUZBVUxUX1BPTExfSU5URVJWQUw9NQogICAgICAtIEFQX1dFQkhPT0tfVElNRU9VVF9TRUNPTkRTPTMwCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3JlczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2Vfc3RhcnRlZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjgwJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX0RCPWFjdGl2ZXBpZWNlcwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICB2b2x1bWVzOgogICAgICAtICdwZy1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAncmVkaXNfZGF0YTovZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSByZWRpcy1jbGkKICAgICAgICAtIHBpbmcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=","tags":["workflow","automation","no code","open source"],"logo":"svgs\/activepieces.png","minversion":"0.0.0","port":"80"},"appsmith":{"documentation":"https:\/\/appsmith.com?utm_source=coolify.io","slogan":"A low-code application platform for building internal tools.","compose":"c2VydmljZXM6CiAgYXBwc21pdGg6CiAgICBpbWFnZTogJ2luZGV4LmRvY2tlci5pby9hcHBzbWl0aC9hcHBzbWl0aC1jZTpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fQVBQU01JVEgKICAgICAgLSBBUFBTTUlUSF9NQUlMX0VOQUJMRUQ9ZmFsc2UKICAgICAgLSBBUFBTTUlUSF9ESVNBQkxFX1RFTEVNRVRSWT10cnVlCiAgICAgIC0gQVBQU01JVEhfRElTQUJMRV9JTlRFUkNPTT10cnVlCiAgICAgIC0gQVBQU01JVEhfU0VOVFJZX0RTTj0KICAgICAgLSBBUFBTTUlUSF9TTUFSVF9MT09LX0lEPQogICAgdm9sdW1lczoKICAgICAgLSAnc3RhY2tzLWRhdGE6L2FwcHNtaXRoLXN0YWNrcycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo4MCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=","tags":["lowcode","nocode","no","low","platform"],"logo":"svgs\/appsmith.svg","minversion":"0.0.0"},"appwrite":{"documentation":"https:\/\/appwrite.io?utm_source=coolify.io","slogan":"A backend-as-a-service platform that simplifies the web & mobile app development.","compose":"eC1sb2dnaW5nOgogIGxvZ2dpbmc6CiAgICBkcml2ZXI6IGpzb24tZmlsZQogICAgb3B0aW9uczoKICAgICAgbWF4LWZpbGU6ICc1JwogICAgICBtYXgtc2l6ZTogMTBtCnNlcnZpY2VzOgogIGFwcHdyaXRlOgogICAgaW1hZ2U6ICdhcHB3cml0ZS9hcHB3cml0ZToxLjUnCiAgICBjb250YWluZXJfbmFtZTogYXBwd3JpdGUKICAgIGxvZ2dpbmc6CiAgICAgIGRyaXZlcjoganNvbi1maWxlCiAgICAgIG9wdGlvbnM6CiAgICAgICAgbWF4LWZpbGU6ICc1JwogICAgICAgIG1heC1zaXplOiAxMG0KICAgIHZvbHVtZXM6CiAgICAgIC0gJ2FwcHdyaXRlLXVwbG9hZHM6L3N0b3JhZ2UvdXBsb2FkczpydycKICAgICAgLSAnYXBwd3JpdGUtY2FjaGU6L3N0b3JhZ2UvY2FjaGU6cncnCiAgICAgIC0gJ2FwcHdyaXRlLWNvbmZpZzovc3RvcmFnZS9jb25maWc6cncnCiAgICAgIC0gJ2FwcHdyaXRlLWNlcnRpZmljYXRlczovc3RvcmFnZS9jZXJ0aWZpY2F0ZXM6cncnCiAgICAgIC0gJ2FwcHdyaXRlLWZ1bmN0aW9uczovc3RvcmFnZS9mdW5jdGlvbnM6cncnCiAgICBkZXBlbmRzX29uOgogICAgICAtIGFwcHdyaXRlLW1hcmlhZGIKICAgICAgLSBhcHB3cml0ZS1yZWRpcwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0FQUFdSSVRFPS8KICAgICAgLSBfQVBQX0VOVgogICAgICAtIF9BUFBfV09SS0VSX1BFUl9DT1JFCiAgICAgIC0gX0FQUF9MT0NBTEUKICAgICAgLSBfQVBQX0NPTlNPTEVfV0hJVEVMSVNUX1JPT1QKICAgICAgLSBfQVBQX0NPTlNPTEVfV0hJVEVMSVNUX0VNQUlMUwogICAgICAtIF9BUFBfQ09OU09MRV9XSElURUxJU1RfSVBTCiAgICAgIC0gLine truncated
+{"activepieces":{"documentation":"https:\/\/www.activepieces.com\/docs\/getting-started\/introduction?utm_source=coolify.io","slogan":"Open source no-code business automation.","compose":"c2VydmljZXM6CiAgYWN0aXZlcGllY2VzOgogICAgaW1hZ2U6ICdnaGNyLmlvL2FjdGl2ZXBpZWNlcy9hY3RpdmVwaWVjZXM6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0FDVElWRVBJRUNFUwogICAgICAtIEFQX0FQSV9LRVk9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfQVBJS0VZCiAgICAgIC0gQVBfRU5DUllQVElPTl9LRVk9JFNFUlZJQ0VfUEFTU1dPUkRfRU5DUllQVElPTktFWQogICAgICAtIEFQX0VOR0lORV9FWEVDVVRBQkxFX1BBVEg9ZGlzdC9wYWNrYWdlcy9lbmdpbmUvbWFpbi5qcwogICAgICAtIEFQX0VOVklST05NRU5UPXByb2QKICAgICAgLSBBUF9FWEVDVVRJT05fTU9ERT1VTlNBTkRCT1hFRAogICAgICAtIEFQX0ZST05URU5EX1VSTD0kU0VSVklDRV9GUUROX0FDVElWRVBJRUNFUwogICAgICAtIEFQX0pXVF9TRUNSRVQ9JFNFUlZJQ0VfUEFTU1dPUkRfNjRfSldUCiAgICAgIC0gQVBfUE9TVEdSRVNfREFUQUJBU0U9YWN0aXZlcGllY2VzCiAgICAgIC0gQVBfUE9TVEdSRVNfSE9TVD1wb3N0Z3JlcwogICAgICAtIEFQX1BPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gQVBfUE9TVEdSRVNfUE9SVD01NDMyCiAgICAgIC0gQVBfUE9TVEdSRVNfVVNFUk5BTUU9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIEFQX1JFRElTX0hPU1Q9cmVkaXMKICAgICAgLSBBUF9SRURJU19QT1JUPTYzNzkKICAgICAgLSBBUF9TQU5EQk9YX1JVTl9USU1FX1NFQ09ORFM9NjAwCiAgICAgIC0gQVBfVEVMRU1FVFJZX0VOQUJMRUQ9dHJ1ZQogICAgICAtICdBUF9URU1QTEFURVNfU09VUkNFX1VSTD1odHRwczovL2Nsb3VkLmFjdGl2ZXBpZWNlcy5jb20vYXBpL3YxL2Zsb3ctdGVtcGxhdGVzJwogICAgICAtIEFQX1RSSUdHRVJfREVGQVVMVF9QT0xMX0lOVEVSVkFMPTUKICAgICAgLSBBUF9XRUJIT09LX1RJTUVPVVRfU0VDT05EUz0zMAogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX3N0YXJ0ZWQKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo4MCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHBvc3RncmVzOgogICAgaW1hZ2U6ICdwb3N0Z3JlczpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19EQj1hY3RpdmVwaWVjZXMKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgdm9sdW1lczoKICAgICAgLSAncGctZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOmxhdGVzdCcKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3JlZGlzX2RhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK","tags":["workflow","automation","no code","open source"],"logo":"svgs\/activepieces.png","minversion":"0.0.0","port":"80"},"appsmith":{"documentation":"https:\/\/appsmith.com?utm_source=coolify.io","slogan":"A low-code application platform for building internal tools.","compose":"c2VydmljZXM6CiAgYXBwc21pdGg6CiAgICBpbWFnZTogJ2luZGV4LmRvY2tlci5pby9hcHBzbWl0aC9hcHBzbWl0aC1jZTpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fQVBQU01JVEgKICAgICAgLSBBUFBTTUlUSF9NQUlMX0VOQUJMRUQ9ZmFsc2UKICAgICAgLSBBUFBTTUlUSF9ESVNBQkxFX1RFTEVNRVRSWT10cnVlCiAgICAgIC0gQVBQU01JVEhfRElTQUJMRV9JTlRFUkNPTT10cnVlCiAgICAgIC0gQVBQU01JVEhfU0VOVFJZX0RTTj0KICAgICAgLSBBUFBTTUlUSF9TTUFSVF9MT09LX0lEPQogICAgdm9sdW1lczoKICAgICAgLSAnc3RhY2tzLWRhdGE6L2FwcHNtaXRoLXN0YWNrcycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo4MCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=","tags":["lowcode","nocode","no","low","platform"],"logo":"svgs\/appsmith.svg","minversion":"0.0.0"},"appwrite":{"documentation":"https:\/\/appwrite.io?utm_source=coolify.io","slogan":"A backend-as-a-service platform that simplifies the web & mobile app development.","compose":"eC1sb2dnaW5nOgogIGxvZ2dpbmc6CiAgICBkcml2ZXI6IGpzb24tZmlsZQogICAgb3B0aW9uczoKICAgICAgbWF4LWZpbGU6ICc1JwogICAgICBtYXgtc2l6ZTogMTBtCnNlcnZpY2VzOgogIGFwcHdyaXRlOgogICAgaW1hZ2U6ICdhcHB3cml0ZS9hcHB3cml0ZToxLjUnCiAgICBjb250YWluZXJfbmFtZTogYXBwd3JpdGUKICAgIGxvZ2dpbmc6CiAgICAgIGRyaXZlcjoganNvbi1maWxlCiAgICAgIG9wdGlvbnM6CiAgICAgICAgbWF4LWZpbGU6ICc1JwogICAgICAgIG1heC1zaXplOiAxMG0KICAgIHZvbHVtZXM6CiAgICAgIC0gJ2FwcHdyaXRlLXVwbG9hZHM6L3N0b3JhZ2UvdXBsb2FkczpydycKICAgICAgLSAnYXBwd3JpdGUtY2FjaGU6L3N0b3JhZ2UvY2FjaGU6cncnCiAgICAgIC0gJ2FwcHdyaXRlLWNvbmZpZzovc3RvcmFnZS9jb25maWc6cncnCiAgICAgIC0gJ2FwcHdyaXRlLWNlcnRpZmljYXRlczovc3RvcmFnZS9jZXJ0aWZpY2F0ZXM6cncnCiAgICAgIC0gJ2FwcHdyaXRlLWZ1bmN0aW9uczovc3RvcmFnZS9mdW5jdGlvbnM6cncnCiAgICBkZXBlbmRzX29uOgogICAgICAtIGFwcHdyaXRlLW1hcmlhZGIKICAgICAgLSBhcHB3cml0ZS1yZWRpcwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0FQUFdSSVRFPS8KICAgICAgLSBfQVBQX0VOVgogICAgICAtIF9BUFBfV09SS0VSX1BFUl9DT1JFCiAgICAgIC0gX0FQUF9MT0NBTEUKICAgICAgLSBfQVBQX0NPTlNPTEVfV0hJVEVMSVNUX1JPT1QKICAgICAgLSBfQVBQX0NPTlNPTEVfV0hJVEVMSVNUX0VNQUlMUwogICAgICAtIF9BLine truncated

tests/Feature/DockerComposeParseTest.php

@@ -11,69 +11,56 @@ use Visus\Cuid2\Cuid2;
 
 ray()->clearAll();
 beforeEach(function () {
-    $this->applicationComposeFile = [
-        'version' => '3.8',
-        'services' => [
-            'app' => [
-                'image' => 'nginx',
-                'environment' => [
-                    'SERVICE_FQDN_APP' => '/app',
-                    'APP_KEY' => 'base64',
-                    'APP_DEBUG' => '${APP_DEBUG:-false}',
-                    'APP_URL' => '$SERVICE_FQDN_APP',
-                ],
-                'volumes' => [
-                    './nginx:/etc/nginx',
-                    'data:/var/www/html',
-                ],
-                'depends_on' => [
-                    'db',
-                ],
-            ],
-            'db' => [
-                'image' => 'postgres',
-                'environment' => [
-                    'POSTGRES_USER' => '${POSTGRES_USER:-postgres}',
-                    'POSTGRES_PASSWORD' => '${POSTGRES_PASSWORD:-postgres}',
-                ],
-                'volumes' => [
-                    'dbdata:/var/lib/postgresql/data',
-                ],
-                'healthcheck' => [
-                    'test' => ['CMD', 'pg_isready', '-U', 'postgres'],
-                    'interval' => '2s',
-                    'timeout' => '10s',
-                    'retries' => 10,
-                ],
-                'depends_on' => [
-                    'app' => [
-                        'condition' => 'service_healthy',
-                    ],
-                ],
+    $this->applicationYaml = '
+version: "3.8"
+services:
+  app:
+    image: nginx
+    environment:
+      SERVICE_FQDN_APP: /app
+      APP_KEY: base64
+      APP_DEBUG: "${APP_DEBUG:-false}"
+      APP_URL: $SERVICE_FQDN_APP
+    volumes:
+      - "./nginx:/etc/nginx"
+      - "data:/var/www/html"
+    depends_on:
+      - db
+  db:
+    image: postgres
+    environment:
+      POSTGRES_USER: "${POSTGRES_USER:-postgres}"
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:-postgres}"
+    volumes:
+      - "dbdata:/var/lib/postgresql/data"
+    healthcheck:
+      test:
+        - CMD
+        - pg_isready
+        - "-U"
+        - "postgres"
+      interval: 2s
+      timeout: 10s
+      retries: 10
+    depends_on:
+      app:
+        condition: service_healthy
+networks:
+  default:
+    name: something
+    external: true
+  noinet:
+    driver: bridge
+    internal: true';
 
-            ],
-
-        ],
-        'networks' => [
-            'default' => [
-                'name' => 'something',
-                'external' => true,
-            ],
-            'noinet' => [
-                'driver' => 'bridge',
-                'internal' => true,
-            ],
-        ],
-    ];
-    $this->applicationComposeFileString = Yaml::dump($this->applicationComposeFile, 10, 2);
-    $this->jsonapplicationComposeFile = json_encode($this->applicationComposeFile, JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR);
+    $this->applicationComposeFileString = Yaml::parse($this->applicationYaml);
 
     $this->application = Application::create([
         'name' => 'Application for tests',
         'docker_compose_domains' => json_encode([
             'app' => [
                 'domain' => 'http://bcoowoookw0co4cok4sgc4k8.127.0.0.1.sslip.io',
-            ]
+            ],
         ]),
         'uuid' => 'bcoowoookw0co4cok4sgc4k8',
         'repository_project_id' => 603035348,
@@ -81,7 +68,7 @@ beforeEach(function () {
         'git_branch' => 'main',
         'base_directory' => '/docker-compose-test',
         'docker_compose_location' => 'docker-compose.yml',
-        'docker_compose_raw' => $this->applicationComposeFileString,
+        'docker_compose_raw' => $this->applicationYaml,
         'build_pack' => 'dockercompose',
         'ports_exposes' => '3000',
         'environment_id' => 1,
@@ -90,101 +77,77 @@ beforeEach(function () {
         'source_id' => 1,
         'source_type' => GithubApp::class,
     ]);
+    $this->serviceYaml = '
+version: "3.8"
+services:
+  activepieces:
+    image: ghcr.io/activepieces/activepieces:latest
+    environment:
+      - SERVICE_FQDN_ACTIVEPIECES
+      - AP_ENCRYPTION_KEY=$SERVICE_PASSWORD_ENCRYPTIONKEY
+      - AP_EXECUTION_MODE=UNSANDBOXED
+      - AP_FRONTEND_URL=$SERVICE_FQDN_ACTIVEPIECES
+      - AP_TEST=${AP_TEST:-test}
+    volumes:
+      - "dbdata:/var/lib/postgresql/data"
+    depends_on:
+      - postgres
+      - redis
+  activepieces2:
+    image: ghcr.io/activepieces/activepieces:latest
+    environment:
+      TEST: $SERVICE_FQDN_ACTIVEPIECES
+    volumes:
+      - "dbdata:/var/lib/postgresql/data"
+    depends_on:
+      - postgres
+      - redis
+  postgres:
+    image: postgres:latest
+    environment:
+      POSTGRES_DB: activepieces
+      POSTGRES_USER: $SERVICE_USER_POSTGRES
+      POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
+    volumes:
+      - "dbdata:/var/lib/postgresql/data"
+    healthcheck:
+      test:
+        - CMD
+        - pg_isready
+        - "-U"
+        - "postgres"
+      interval: 2s
+      timeout: 10s
+      retries: 10
+  redis:
+    image: redis:latest
+    volumes:
+      - "redis_data:/data"
+    healthcheck:
+      test:
+        - CMD
+        - redis-cli
+        - ping
+      interval: 2s
+      timeout: 10s
+      retries: 10
+volumes:
+  dbdata:
+  redis_data:
+networks:
+  default:
+    name: something
+    external: true
+  noinet:
+    driver: bridge
+    internal: true';
 
-
-    $this->serviceComposeFile = [
-        'services' => [
-            'activepieces' => [
-                'image' => 'ghcr.io/activepieces/activepieces:latest',
-                'environment' => [
-                    'SERVICE_FQDN_ACTIVEPIECES_80' => '/app',
-                    'AP_API_KEY' => '$SERVICE_PASSWORD_64_APIKEY',
-                    'AP_ENCRYPTION_KEY' => '$SERVICE_PASSWORD_ENCRYPTIONKEY',
-                    'AP_ENGINE_EXECUTABLE_PATH' => 'dist/packages/engine/main.js',
-                    'AP_ENVIRONMENT' => 'prod',
-                    'AP_EXECUTION_MODE' => 'UNSANDBOXED',
-                    'AP_FRONTEND_URL' => '$SERVICE_FQDN_ACTIVEPIECES',
-                    'AP_JWT_SECRET' => '$SERVICE_PASSWORD_64_JWT',
-                    'AP_POSTGRES_DATABASE' => 'activepieces',
-                    'AP_POSTGRES_HOST' => 'postgres',
-                    'AP_POSTGRES_PASSWORD' => '$SERVICE_PASSWORD_POSTGRES',
-                    'AP_POSTGRES_PORT' => '5432',
-                    'AP_POSTGRES_USERNAME' => '$SERVICE_USER_POSTGRES',
-                    'AP_REDIS_HOST' => 'redis',
-                    'AP_REDIS_PORT' => '6379',
-                    'AP_SANDBOX_RUN_TIME_SECONDS' => '600',
-                    'AP_TELEMETRY_ENABLED' => 'true',
-                    'AP_TEMPLATES_SOURCE_URL' => 'https://cloud.activepieces.com/api/v1/flow-templates',
-                    'AP_TRIGGER_DEFAULT_POLL_INTERVAL' => '5',
-                    'AP_WEBHOOK_TIMEOUT_SECONDS' => '30',
-                    'AP_TEST' => '${AP_TEST:-test}',
-
-                ],
-                'depends_on' => [
-                    'postgres' => [
-                        'condition' => 'service_healthy',
-                    ],
-                    'redis' => [
-                        'condition' => 'service_started',
-                    ],
-                ],
-                'healthcheck' => [
-                    'test' => [
-                        'CMD',
-                        'curl',
-                        '-f',
-                        'http://127.0.0.1:80',
-                    ],
-                    'interval' => '5s',
-                    'timeout' => '20s',
-                    'retries' => 10,
-                ],
-            ],
-            'postgres' => [
-                'image' => 'postgres:latest',
-                'environment' => [
-                    'POSTGRES_DB' => 'activepieces',
-                    'POSTGRES_PASSWORD' => '$SERVICE_PASSWORD_POSTGRES',
-                    'POSTGRES_USER' => '$SERVICE_USER_POSTGRES',
-                ],
-                'volumes' => [
-                    'dbdata:/var/lib/postgresql/data',
-                ],
-                'healthcheck' => [
-                    'test' => [
-                        'CMD-SHELL',
-                        'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}',
-                    ],
-                    'interval' => '5s',
-                    'timeout' => '20s',
-                    'retries' => 10,
-                ],
-            ],
-            'redis' => [
-                'image' => 'redis:latest',
-                'volumes' => [
-                    'redis_data:/data',
-                ],
-                'healthcheck' => [
-                    'test' => [
-                        'CMD',
-                        'redis-cli',
-                        'ping',
-                    ],
-                    'interval' => '5s',
-                    'timeout' => '20s',
-                    'retries' => 10,
-                ],
-            ],
-        ],
-    ];
-    $this->serviceComposeFileString = Yaml::dump($this->serviceComposeFile, 10, 2);
-    $this->jsonServiceComposeFile = json_encode($this->serviceComposeFile, JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR);
+    $this->serviceComposeFileString = Yaml::parse($this->serviceYaml);
 
     $this->service = Service::create([
         'name' => 'Service for tests',
         'uuid' => (string) new Cuid2(),
-        'docker_compose_raw' => $this->serviceComposeFileString,
+        'docker_compose_raw' => $this->serviceYaml,
         'environment_id' => 1,
         'server_id' => 0,
         'destination_id' => 0,
@@ -362,23 +325,24 @@ afterEach(function () {
 
 test('ServiceComposeParseNew', function () {
     ray()->clearAll();
-    $output = newParser($this->application);
-    ray('New parser');
-    ray($output->toArray());
+    $output = newParser($this->service);
+    // ray('New parser');
+    // ray($output->toArray());
+    ray($this->service->environment_variables->pluck('value', 'key')->toArray());
     expect($output)->toBeInstanceOf(Collection::class);
 });
 
 // test('ServiceComposeParseOld', function () {
 //     $output = parseDockerComposeFile($this->service);
 //     ray('Old parser');
-//     ray($output->toArray());
-//     ray($this->service->environment_variables->pluck('value', 'key')->toArray());
-//     foreach ($this->service->applications as $application) {
-//         ray($application->persistentStorages->pluck('mount_path', 'name')->toArray());
-//     }
-//     foreach ($this->service->databases as $database) {
-//         ray($database->persistentStorages->pluck('mount_path', 'name')->toArray());
-//     }
+//     // ray($output->toArray());
+//     // ray($this->service->environment_variables->pluck('value', 'key')->toArray());
+//     // foreach ($this->service->applications as $application) {
+//     //     ray($application->persistentStorages->pluck('mount_path', 'name')->toArray());
+//     // }
+//     // foreach ($this->service->databases as $database) {
+//     //     ray($database->persistentStorages->pluck('mount_path', 'name')->toArray());
+//     // }
 //     expect($output)->toBeInstanceOf(Collection::class);
 // });
 
@@ -387,3 +351,30 @@ test('ServiceComposeParseNew', function () {
 //     $output = instant_remote_process(['docker --version'], $server);
 //     expect($output)->toContain('Docker version');
 // });
+
+// test('ConvertComposeEnvironmentToArray', function () {
+//     ray()->clearAll();
+//     $yaml = '
+// services:
+//   activepieces:
+//     environment:
+//       - SERVICE_FQDN_ACTIVEPIECES=/app
+//       - AP_API_KEY=$SERVICE_PASSWORD_64_APIKEY
+//   activepieces2:
+//     environment:
+//       - SERVICE_FQDN_ACTIVEPIECES=/v1/realtime
+//   postgres:
+//     environment:
+//       - POSTGRES_DB: activepieces
+// ';
+//     $parsedYaml = Yaml::parse($yaml);
+//     $output = convertComposeEnvironmentToArray($parsedYaml['services']['activepieces']['environment']);
+//     $output2 = convertComposeEnvironmentToArray($parsedYaml['services']['activepieces2']['environment']);
+//     $dboutput = convertComposeEnvironmentToArray($parsedYaml['services']['postgres']['environment']);
+//     ray($output);
+//     ray($output2);
+//     ray($dboutput);
+//     expect($output)->toBeInstanceOf(Collection::class);
+//     expect($output2)->toBeInstanceOf(Collection::class);
+//     expect($dboutput)->toBeInstanceOf(Collection::class);
+// });