rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: support dns custom docker option

Browse source
This commit is contained in:
tikimo 2026-06-02 17:46:47 +03:00
parent d87ab279fb
commit 6692ff3e36
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrap/helpers/docker.php
View file

@ -1000,6 +1000,7 @@ function convertDockerRunToCompose(?string $custom_docker_run_options = null)
'--ulimit', '--ulimit',
'--device', '--device',
'--shm-size', '--shm-size',
'--dns',
]); ]);
$mapping = collect([ $mapping = collect([
'--cap-add' => 'cap_add', '--cap-add' => 'cap_add',
@ -1013,6 +1014,7 @@ function convertDockerRunToCompose(?string $custom_docker_run_options = null)
'--ip' => 'ip', '--ip' => 'ip',
'--ip6' => 'ip6', '--ip6' => 'ip6',
'--shm-size' => 'shm_size', '--shm-size' => 'shm_size',
'--dns' => 'dns',
'--gpus' => 'gpus', '--gpus' => 'gpus',
'--hostname' => 'hostname', '--hostname' => 'hostname',
'--entrypoint' => 'entrypoint', '--entrypoint' => 'entrypoint',

1
tests/Feature/CommandInjectionSecurityTest.php
View file

@ -733,6 +733,7 @@
'--entrypoint "sh -c \'npm start\'"', '--entrypoint "sh -c \'npm start\'"',
'--entrypoint "sh -c \'php artisan schedule:work\'"', '--entrypoint "sh -c \'php artisan schedule:work\'"',
'--hostname "my-host"', '--hostname "my-host"',
'--dns 10.0.0.10 --dns=1.1.1.1',
]); ]);
}); });

18
tests/Feature/DockerCustomCommandsTest.php
View file

@ -46,6 +46,24 @@
]); ]);
}); });
test('ConvertDns', function () {
$input = '--dns 10.0.0.10 --dns=1.1.1.1';
$output = convertDockerRunToCompose($input);
expect($output)->toBe([
'dns' => ['10.0.0.10', '1.1.1.1'],
]);
});
test('ConvertDnsWithOtherOptions', function () {
$input = '--cap-add=NET_ADMIN --dns 10.0.0.10 --init';
$output = convertDockerRunToCompose($input);
expect($output)->toBe([
'cap_add' => ['NET_ADMIN'],
'dns' => ['10.0.0.10'],
'init' => true,
]);
});
test('ConvertPrivilegedAndInit', function () { test('ConvertPrivilegedAndInit', function () {
$input = '---privileged --init'; $input = '---privileged --init';
$output = convertDockerRunToCompose($input); $output = convertDockerRunToCompose($input);