revert default StartLimitIntervalSec override

aksiksi · Mar 16, 2024 · 2629f34 · 2629f34
1 parent 0a4b995
commit 2629f34
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 39 deletions.
diff --git a/nixos-test/docker-compose.nix b/nixos-test/docker-compose.nix
@@ -1,4 +1,4 @@
-# Auto-generated using compose2nix v0.1.7.
+# Auto-generated using compose2nix v0.1.8.
 { pkgs, lib, ... }:
 
 {
@@ -35,7 +35,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "docker-network-myproject-default.service"

diff --git a/nixos-test/podman-compose.nix b/nixos-test/podman-compose.nix
@@ -1,4 +1,4 @@
-# Auto-generated using compose2nix v0.1.7.
+# Auto-generated using compose2nix v0.1.8.
 { pkgs, lib, ... }:
 
 {
@@ -37,7 +37,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "podman-network-myproject-default.service"

diff --git a/systemd.go b/systemd.go
@@ -200,26 +200,17 @@ func (c *NixContainerSystemdConfig) ParseRestartPolicy(service *types.ServiceCon
 			c.Unit.Set("StartLimitIntervalSec", windowSecs)
 		} else if c.StartLimitBurst != nil {
 			c.Unit.Set("StartLimitIntervalSec", "infinity")
-		} else {
-			// Defaults to zero (i.e., indefinite retry attempts).
-			c.Unit.Set("StartLimitIntervalSec", 0)
 		}
 	}
 
-	if indefiniteRestart {
-		if _, ok := c.Unit.Options["StartLimitIntervalSec"]; !ok {
-			// Defaults to zero (i.e., indefinite retry attempts).
-			c.Unit.Set("StartLimitIntervalSec", 0)
-		}
-		if runtime == ContainerRuntimeDocker {
-			// This simulates the default behavior of Docker. Basically, Docker will restart
-			// the container with a sleep period of 100ms. This sleep period is doubled until a
-			// maximum of 1 minute.
-			// See: https://docs.docker.com/reference/cli/docker/container/run/#restart
-			c.Service.Set("RestartSec", "100ms")
-			c.Service.Set("RestartSteps", 9) // 2^(9 attempts) = 512 (* 100ms) ~= 1 minute
-			c.Service.Set("RestartMaxDelaySec", "1m")
-		}
+	if indefiniteRestart && runtime == ContainerRuntimeDocker {
+		// This simulates the default behavior of Docker. Basically, Docker will restart
+		// the container with a sleep period of 100ms. This sleep period is doubled until a
+		// maximum of 1 minute.
+		// See: https://docs.docker.com/reference/cli/docker/container/run/#restart
+		c.Service.Set("RestartSec", "100ms")
+		c.Service.Set("RestartSteps", 9) // 2^(9 attempts) = 512 (* 100ms) ~= 1 minute
+		c.Service.Set("RestartMaxDelaySec", "1m")
 	}
 
 	return nil

diff --git a/testdata/TestDocker_EnvFilesOnly_out.nix b/testdata/TestDocker_EnvFilesOnly_out.nix
@@ -103,7 +103,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "docker-network-myproject-default.service"
@@ -280,7 +279,6 @@
     };
     unitConfig = {
       AllowIsolate = lib.mkOverride 500 true;
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     partOf = [
       "docker-compose-myproject-root.target"

diff --git a/testdata/TestDocker_NoWriteNixSetup_out.nix b/testdata/TestDocker_NoWriteNixSetup_out.nix
@@ -105,7 +105,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "docker-network-myproject-default.service"
@@ -300,7 +299,6 @@
     };
     unitConfig = {
       AllowIsolate = lib.mkOverride 500 true;
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     partOf = [
       "docker-compose-myproject-root.target"

diff --git a/testdata/TestDocker_OverrideSystemdStopTimeout_out.nix b/testdata/TestDocker_OverrideSystemdStopTimeout_out.nix
@@ -113,7 +113,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "docker-network-myproject-default.service"
@@ -311,7 +310,6 @@
     };
     unitConfig = {
       AllowIsolate = lib.mkOverride 500 true;
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     partOf = [
       "docker-compose-myproject-root.target"

diff --git a/testdata/TestDocker_RemoveVolumes_out.nix b/testdata/TestDocker_RemoveVolumes_out.nix
@@ -111,7 +111,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "docker-network-myproject-default.service"
@@ -306,7 +305,6 @@
     };
     unitConfig = {
       AllowIsolate = lib.mkOverride 500 true;
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     partOf = [
       "docker-compose-myproject-root.target"

diff --git a/testdata/TestDocker_SystemdMount_out.nix b/testdata/TestDocker_SystemdMount_out.nix
@@ -113,7 +113,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "docker-network-myproject-default.service"
@@ -314,7 +313,6 @@
     };
     unitConfig = {
       AllowIsolate = lib.mkOverride 500 true;
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     partOf = [
       "docker-compose-myproject-root.target"

diff --git a/testdata/TestDocker_WithProject_out.nix b/testdata/TestDocker_WithProject_out.nix
@@ -111,7 +111,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "docker-network-myproject-default.service"
@@ -306,7 +305,6 @@
     };
     unitConfig = {
       AllowIsolate = lib.mkOverride 500 true;
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     partOf = [
       "docker-compose-myproject-root.target"

diff --git a/testdata/TestDocker_out.nix b/testdata/TestDocker_out.nix
@@ -109,7 +109,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "docker-network-myproject-default.service"
@@ -301,7 +300,6 @@
     };
     unitConfig = {
       AllowIsolate = lib.mkOverride 500 true;
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     partOf = [
       "docker-compose-myproject-root.target"

diff --git a/testdata/TestPodman_WithProject_out.nix b/testdata/TestPodman_WithProject_out.nix
@@ -105,7 +105,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "podman-network-myproject-default.service"
@@ -285,7 +284,6 @@
     };
     unitConfig = {
       AllowIsolate = lib.mkOverride 500 true;
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     partOf = [
       "podman-compose-myproject-root.target"

diff --git a/testdata/TestPodman_out.nix b/testdata/TestPodman_out.nix
@@ -103,7 +103,6 @@
     };
     unitConfig = {
       Description = lib.mkOverride 500 "This is the sabnzbd container!";
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     after = [
       "podman-network-myproject-default.service"
@@ -280,7 +279,6 @@
     };
     unitConfig = {
       AllowIsolate = lib.mkOverride 500 true;
-      StartLimitIntervalSec = lib.mkOverride 500 0;
     };
     partOf = [
       "podman-compose-myproject-root.target"