dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: new parser with SERVICE_URL_ envs

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-10 11:46:41 +02:00
parent 290c287f7e
commit e6566d8be3
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bootstrap/helpers/constants.php
View File

@@ -40,6 +40,7 @@ const DATABASE_DOCKER_IMAGES = [
]; ];
const SPECIFIC_SERVICES = [ const SPECIFIC_SERVICES = [
'quay.io/minio/minio', 'quay.io/minio/minio',
'minio/minio',
'svhd/logto', 'svhd/logto',
]; ];

1
bootstrap/helpers/shared.php
View File

@@ -3181,6 +3181,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
} elseif ($isService) { } elseif ($isService) {
$fqdn = generateFqdn($server, "$fqdnFor-$uuid"); $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
} }
$fqdn = str($fqdn)->replace('http://', '')->replace('https://', '');
$resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->firstOrCreate([ $resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->firstOrCreate([
'key' => $key->value(), 'key' => $key->value(),
$nameOfId => $resource->id, $nameOfId => $resource->id,

6
tests/Feature/DockerComposeParseTest.php
View File

@@ -1,10 +1,9 @@
<?php <?php
use App\Actions\Service\DeleteService; use App\Jobs\DeleteResourceJob;
use App\Models\Application; use App\Models\Application;
use App\Models\ApplicationPreview; use App\Models\ApplicationPreview;
use App\Models\GithubApp; use App\Models\GithubApp;
use App\Models\Server;
use App\Models\Service; use App\Models\Service;
use App\Models\StandaloneDocker; use App\Models\StandaloneDocker;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@@ -93,6 +92,7 @@ services:
environment: environment:
- SERVICE_FQDN_ACTIVEPIECES - SERVICE_FQDN_ACTIVEPIECES
- AP_API_KEY=$SERVICE_PASSWORD_64_APIKEY - AP_API_KEY=$SERVICE_PASSWORD_64_APIKEY
- AP_URL=$SERVICE_URL_ACTIVEPIECES
- AP_ENCRYPTION_KEY=$SERVICE_PASSWORD_ENCRYPTIONKEY - AP_ENCRYPTION_KEY=$SERVICE_PASSWORD_ENCRYPTIONKEY
- AP_ENGINE_EXECUTABLE_PATH=dist/packages/engine/main.js - AP_ENGINE_EXECUTABLE_PATH=dist/packages/engine/main.js
- AP_ENVIRONMENT=prod - AP_ENVIRONMENT=prod
@@ -165,7 +165,7 @@ services:
afterEach(function () { afterEach(function () {
// $this->applicationPreview->forceDelete(); // $this->applicationPreview->forceDelete();
$this->application->forceDelete(); $this->application->forceDelete();
DeleteService::run($this->service); DeleteResourceJob::dispatchSync($this->service);
$this->service->forceDelete(); $this->service->forceDelete();
}); });