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

feat: Add Code Server environment variables to Service model

Browse Source
This commit is contained in:
Andras Bacsai
2024-08-29 10:44:16 +02:00
parent 5525c02c7f
commit d27b1766e6
3 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Models/Service.php
View File

@@ -678,6 +678,32 @@ class Service extends BaseModel
$fields->put('GitLab', $data->toArray()); $fields->put('GitLab', $data->toArray());
break; break;
case str($image)->contains('code-server'):
$data = collect([]);
$password = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_64_PASSWORDCODESERVER')->first();
if ($password) {
$data = $data->merge([
'Password' => [
'key' => data_get($password, 'key'),
'value' => data_get($password, 'value'),
'rules' => 'required',
'isPassword' => true,
],
]);
}
$sudoPassword = $this->environment_variables()->where('key', 'SERVICE_PASSWORD_SUDOCODESERVER')->first();
if ($sudoPassword) {
$data = $data->merge([
'Sudo Password' => [
'key' => data_get($sudoPassword, 'key'),
'value' => data_get($sudoPassword, 'value'),
'rules' => 'required',
'isPassword' => true,
],
]);
}
$fields->put('Code Server', $data->toArray());
break;
} }
} }
$databases = $this->databases()->get(); $databases = $this->databases()->get();
@@ -724,8 +750,8 @@ class Service extends BaseModel
$fields->put('PostgreSQL', $data->toArray()); $fields->put('PostgreSQL', $data->toArray());
break; break;
case str($image)->contains('mysql'): case str($image)->contains('mysql'):
$userVariables = ['SERVICE_USER_MYSQL', 'SERVICE_USER_WORDPRESS']; $userVariables = ['SERVICE_USER_MYSQL', 'SERVICE_USER_WORDPRESS', 'MYSQL_USER'];
$passwordVariables = ['SERVICE_PASSWORD_MYSQL', 'SERVICE_PASSWORD_WORDPRESS']; $passwordVariables = ['SERVICE_PASSWORD_MYSQL', 'SERVICE_PASSWORD_WORDPRESS', 'MYSQL_PASSWORD'];
$rootPasswordVariables = ['SERVICE_PASSWORD_MYSQLROOT', 'SERVICE_PASSWORD_ROOT']; $rootPasswordVariables = ['SERVICE_PASSWORD_MYSQLROOT', 'SERVICE_PASSWORD_ROOT'];
$dbNameVariables = ['MYSQL_DATABASE']; $dbNameVariables = ['MYSQL_DATABASE'];
$mysql_user = $this->environment_variables()->whereIn('key', $userVariables)->first(); $mysql_user = $this->environment_variables()->whereIn('key', $userVariables)->first();
@@ -774,10 +800,10 @@ class Service extends BaseModel
$fields->put('MySQL', $data->toArray()); $fields->put('MySQL', $data->toArray());
break; break;
case str($image)->contains('mariadb'): case str($image)->contains('mariadb'):
$userVariables = ['SERVICE_USER_MARIADB', 'SERVICE_USER_WORDPRESS', '_APP_DB_USER', 'SERVICE_USER_MYSQL']; $userVariables = ['SERVICE_USER_MARIADB', 'SERVICE_USER_WORDPRESS', '_APP_DB_USER', 'SERVICE_USER_MYSQL', 'MYSQL_USER'];
$passwordVariables = ['SERVICE_PASSWORD_MARIADB', 'SERVICE_PASSWORD_WORDPRESS', '_APP_DB_PASS']; $passwordVariables = ['SERVICE_PASSWORD_MARIADB', 'SERVICE_PASSWORD_WORDPRESS', '_APP_DB_PASS', 'MYSQL_PASSWORD'];
$rootPasswordVariables = ['SERVICE_PASSWORD_MARIADBROOT', 'SERVICE_PASSWORD_ROOT', '_APP_DB_ROOT_PASS']; $rootPasswordVariables = ['SERVICE_PASSWORD_MARIADBROOT', 'SERVICE_PASSWORD_ROOT', '_APP_DB_ROOT_PASS', 'MYSQL_ROOT_PASSWORD'];
$dbNameVariables = ['SERVICE_DATABASE_MARIADB', 'SERVICE_DATABASE_WORDPRESS', '_APP_DB_SCHEMA']; $dbNameVariables = ['SERVICE_DATABASE_MARIADB', 'SERVICE_DATABASE_WORDPRESS', '_APP_DB_SCHEMA', 'MYSQL_DATABASE'];
$mariadb_user = $this->environment_variables()->whereIn('key', $userVariables)->first(); $mariadb_user = $this->environment_variables()->whereIn('key', $userVariables)->first();
$mariadb_password = $this->environment_variables()->whereIn('key', $passwordVariables)->first(); $mariadb_password = $this->environment_variables()->whereIn('key', $passwordVariables)->first();
$mariadb_root_password = $this->environment_variables()->whereIn('key', $rootPasswordVariables)->first(); $mariadb_root_password = $this->environment_variables()->whereIn('key', $rootPasswordVariables)->first();
@@ -824,6 +850,7 @@ class Service extends BaseModel
} }
$fields->put('MariaDB', $data->toArray()); $fields->put('MariaDB', $data->toArray());
break; break;
} }
} }

2
bootstrap/helpers/shared.php
View File

@@ -3453,7 +3453,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
} else { } else {
$shouldGenerateLabelsExactly = $resource->server->settings->generate_exact_labels; $shouldGenerateLabelsExactly = $resource->server->settings->generate_exact_labels;
$uuid = $resource->uuid; $uuid = $resource->uuid;
$network = $resource->server->destination->network; $network = $resource->destination->network;
} }
if ($shouldGenerateLabelsExactly) { if ($shouldGenerateLabelsExactly) {
switch ($server->proxyType()) { switch ($server->proxyType()) {

14
tests/Feature/DockerComposeParseTest.php
View File

@@ -332,13 +332,13 @@ afterEach(function () {
// }); // });
test('ServiceComposeParseNew', function () { // test('ServiceComposeParseNew', function () {
$output = newParser($this->application, pull_request_id: 1, preview_id: $this->applicationPreview->id); // $output = newParser($this->application, pull_request_id: 1, preview_id: $this->applicationPreview->id);
// ray('New parser'); // // ray('New parser');
// ray($output->toArray()); // // ray($output->toArray());
ray($this->service->environment_variables_preview->pluck('value', 'key')->toArray()); // ray($this->service->environment_variables_preview->pluck('value', 'key')->toArray());
expect($output)->toBeInstanceOf(Collection::class); // expect($output)->toBeInstanceOf(Collection::class);
}); // });
// test('ServiceComposeParseOld', function () { // test('ServiceComposeParseOld', function () {
// $output = parseDockerComposeFile($this->service); // $output = parseDockerComposeFile($this->service);