Revert "fix(docker): migrate database start actions from --time to -t flag"

This commit is contained in:
Andras Bacsai
2025-11-28 11:15:55 +01:00
committed by GitHub
parent 2898448fe2
commit 9503da60b4
9 changed files with 13 additions and 13 deletions

View File

@@ -7,7 +7,7 @@ it('ensures stop proxy includes wait loop for container removal', function () {
// Simulate the command sequence from StopProxy
$commands = [
'docker stop -t 30 coolify-proxy 2>/dev/null || true',
'docker stop --time=30 coolify-proxy 2>/dev/null || true',
'docker rm -f coolify-proxy 2>/dev/null || true',
'# Wait for container to be fully removed',
'for i in {1..10}; do',
@@ -21,7 +21,7 @@ it('ensures stop proxy includes wait loop for container removal', function () {
$commandsString = implode("\n", $commands);
// Verify the stop sequence includes all required components
expect($commandsString)->toContain('docker stop -t 30 coolify-proxy')
expect($commandsString)->toContain('docker stop --time=30 coolify-proxy')
->and($commandsString)->toContain('docker rm -f coolify-proxy')
->and($commandsString)->toContain('for i in {1..10}; do')
->and($commandsString)->toContain('if ! docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"')
@@ -41,7 +41,7 @@ it('includes error suppression in stop proxy commands', function () {
// Test that stop/remove commands suppress errors gracefully
$commands = [
'docker stop -t 30 coolify-proxy 2>/dev/null || true',
'docker stop --time=30 coolify-proxy 2>/dev/null || true',
'docker rm -f coolify-proxy 2>/dev/null || true',
];
@@ -54,9 +54,9 @@ it('uses configurable timeout for docker stop', function () {
// Verify that stop command includes the timeout parameter
$timeout = 30;
$stopCommand = "docker stop -t $timeout coolify-proxy 2>/dev/null || true";
$stopCommand = "docker stop --time=$timeout coolify-proxy 2>/dev/null || true";
expect($stopCommand)->toContain('-t 30');
expect($stopCommand)->toContain('--time=30');
});
it('waits for swarm service container removal correctly', function () {