Skip to content

Commit e6566d8

Browse files
committed
fix: new parser with SERVICE_URL_ envs
1 parent 290c287 commit e6566d8

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

bootstrap/helpers/constants.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
];
4141
const SPECIFIC_SERVICES = [
4242
'quay.io/minio/minio',
43+
'minio/minio',
4344
'svhd/logto',
4445
];
4546

bootstrap/helpers/shared.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3181,6 +3181,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
31813181
} elseif ($isService) {
31823182
$fqdn = generateFqdn($server, "$fqdnFor-$uuid");
31833183
}
3184+
$fqdn = str($fqdn)->replace('http://', '')->replace('https://', '');
31843185
$resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->firstOrCreate([
31853186
'key' => $key->value(),
31863187
$nameOfId => $resource->id,

tests/Feature/DockerComposeParseTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
22

3-
use App\Actions\Service\DeleteService;
3+
use App\Jobs\DeleteResourceJob;
44
use App\Models\Application;
55
use App\Models\ApplicationPreview;
66
use App\Models\GithubApp;
7-
use App\Models\Server;
87
use App\Models\Service;
98
use App\Models\StandaloneDocker;
109
use Illuminate\Support\Collection;
@@ -93,6 +92,7 @@
9392
environment:
9493
- SERVICE_FQDN_ACTIVEPIECES
9594
- AP_API_KEY=$SERVICE_PASSWORD_64_APIKEY
95+
- AP_URL=$SERVICE_URL_ACTIVEPIECES
9696
- AP_ENCRYPTION_KEY=$SERVICE_PASSWORD_ENCRYPTIONKEY
9797
- AP_ENGINE_EXECUTABLE_PATH=dist/packages/engine/main.js
9898
- AP_ENVIRONMENT=prod
@@ -165,7 +165,7 @@
165165
afterEach(function () {
166166
// $this->applicationPreview->forceDelete();
167167
$this->application->forceDelete();
168-
DeleteService::run($this->service);
168+
DeleteResourceJob::dispatchSync($this->service);
169169
$this->service->forceDelete();
170170
});
171171

0 commit comments

Comments
 (0)