mirror of
https://github.com/tiennm99/coolify.git
synced 2026-08-20 18:23:40 +00:00
feat(container): support comma-separated roles
Allow s6 services to start for specific roles like horizon, scheduler, nightwatch, and flux while keeping all as the default.
This commit is contained in:
@@ -0,0 +1,53 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Contracts\Process\ProcessResult;
|
||||
use Illuminate\Support\Facades\Process;
|
||||
|
||||
it('matches comma separated container roles and lets all override every service', function (string $roles, string $serviceRole) {
|
||||
$result = runContainerRoleHelper($roles, $serviceRole);
|
||||
|
||||
expect($result->successful())->toBeTrue();
|
||||
})->with([
|
||||
['worker,flux', 'worker'],
|
||||
['worker,flux', 'flux'],
|
||||
['web, all', 'flux'],
|
||||
['flux,all,worker', 'worker'],
|
||||
['horizon,scheduler,nightwatch,flux', 'horizon'],
|
||||
['horizon,scheduler,nightwatch,flux', 'scheduler'],
|
||||
['horizon,scheduler,nightwatch,flux', 'nightwatch'],
|
||||
]);
|
||||
|
||||
it('rejects services missing from the comma separated container roles', function () {
|
||||
$result = runContainerRoleHelper('web,flux', 'worker');
|
||||
|
||||
expect($result->failed())->toBeTrue();
|
||||
});
|
||||
|
||||
it('falls back to the container role from the local env file', function () {
|
||||
$directory = sys_get_temp_dir().'/coolify-container-role-'.bin2hex(random_bytes(4));
|
||||
mkdir($directory);
|
||||
file_put_contents($directory.'/.env', 'COOLIFY_CONTAINER_ROLE=worker,flux'.PHP_EOL);
|
||||
|
||||
$result = runContainerRoleHelper('', 'flux', $directory);
|
||||
|
||||
expect($result->successful())->toBeTrue();
|
||||
});
|
||||
|
||||
it('keeps production and development role helpers in sync', function () {
|
||||
expect(file_get_contents(base_path('docker/production/etc/s6-overlay/scripts/container-role')))
|
||||
->toBe(file_get_contents(base_path('docker/development/etc/s6-overlay/scripts/container-role')));
|
||||
});
|
||||
|
||||
function runContainerRoleHelper(string $roles, string $serviceRole, ?string $workingDirectory = null): ProcessResult
|
||||
{
|
||||
$script = base_path('docker/development/etc/s6-overlay/scripts/container-role');
|
||||
$command = sprintf(
|
||||
'. %s && coolify_container_has_role %s',
|
||||
escapeshellarg($script),
|
||||
escapeshellarg($serviceRole),
|
||||
);
|
||||
|
||||
return Process::path($workingDirectory ?? base_path())
|
||||
->env(['COOLIFY_CONTAINER_ROLE' => $roles])
|
||||
->run($command);
|
||||
}
|
||||
Reference in New Issue
Block a user