fix: only set log opts if driver is set

aksiksi · Oct 7, 2024 · 305a190 · 305a190
1 parent 13b6fa0
commit 305a190
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 202 deletions.
diff --git a/compose.go b/compose.go
@@ -598,18 +598,16 @@ func (g *Generator) buildNixContainer(service types.ServiceConfig, networkMap ma
 	if service.LogDriver != "" {
 		if service.LogDriver != "json-file" || g.UseComposeLogDriver {
 			c.LogDriver = service.LogDriver
+			c.ExtraOptions = append(c.ExtraOptions, mapToRepeatedKeyValFlag("--log-opt", service.LogOpt)...)
 		}
-		// Log options are always passed through.
-		c.ExtraOptions = append(c.ExtraOptions, mapToRepeatedKeyValFlag("--log-opt", service.LogOpt)...)
 	}
 	// New logging setting always overrides the legacy setting.
 	// https://docs.docker.com/compose/compose-file/compose-file-v3/#logging
 	if logging := service.Logging; logging != nil {
 		if logging.Driver != "json-file" || g.UseComposeLogDriver {
 			c.LogDriver = logging.Driver
+			c.ExtraOptions = append(c.ExtraOptions, mapToRepeatedKeyValFlag("--log-opt", logging.Options)...)
 		}
-		// Log options are always passed through.
-		c.ExtraOptions = append(c.ExtraOptions, mapToRepeatedKeyValFlag("--log-opt", logging.Options)...)
 	}
 
 	if err := parseHealthCheck(c, service, g.Runtime); err != nil {

diff --git a/testdata/TestBasic.docker.nix b/testdata/TestBasic.docker.nix
@@ -36,9 +36,6 @@
       "--cpus=1"
       "--dns=1.1.1.1"
       "--health-cmd=curl -f http://localhost/\${POTATO}"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--memory-reservation=524288000b"
       "--memory=1048576000b"
       "--network=container:myproject-sabnzbd"
@@ -95,9 +92,6 @@
     extraOptions = [
       "--health-cmd=curl -f http://localhost/"
       "--hostname=sabnzbd"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network-alias=sabnzbd"
       "--network=myproject_default"
     ];
@@ -151,9 +145,6 @@
       "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=host"
     ];
   };
@@ -283,9 +274,6 @@
     ];
     log-driver = "journald";
     extraOptions = [
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=container:sabnzbd"
     ];
   };

diff --git a/testdata/TestBasic.podman.nix b/testdata/TestBasic.podman.nix
@@ -46,9 +46,6 @@
       "--cpus=1"
       "--dns=1.1.1.1"
       "--health-cmd=curl -f http://localhost/\${POTATO}"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--memory-reservation=524288000b"
       "--memory=1048576000b"
       "--network=container:myproject-sabnzbd"
@@ -103,9 +100,6 @@
     extraOptions = [
       "--health-cmd=curl -f http://localhost/"
       "--hostname=sabnzbd"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network-alias=sabnzbd"
       "--network=myproject_default"
     ];
@@ -156,9 +150,6 @@
       "--health-start-period=40s"
       "--health-startup-interval=5s"
       "--health-timeout=10s"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=host"
     ];
   };
@@ -285,9 +276,6 @@
     ];
     log-driver = "journald";
     extraOptions = [
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=container:sabnzbd"
     ];
   };

diff --git a/testdata/TestBasicAutoFormat.docker.nix b/testdata/TestBasicAutoFormat.docker.nix
@@ -38,9 +38,6 @@
       "--cpus=1"
       "--dns=1.1.1.1"
       "--health-cmd=curl -f http://localhost/\${POTATO}"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--memory-reservation=524288000b"
       "--memory=1048576000b"
       "--network=container:myproject-sabnzbd"
@@ -89,9 +86,6 @@
     extraOptions = [
       "--health-cmd=curl -f http://localhost/"
       "--hostname=sabnzbd"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network-alias=sabnzbd"
       "--network=myproject_default"
     ];
@@ -141,9 +135,6 @@
       "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=host"
     ];
   };
@@ -258,12 +249,7 @@
     };
     dependsOn = [ "sabnzbd" ];
     log-driver = "journald";
-    extraOptions = [
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
-      "--network=container:sabnzbd"
-    ];
+    extraOptions = [ "--network=container:sabnzbd" ];
   };
   systemd.services."docker-traefik" = {
     serviceConfig = {

diff --git a/testdata/TestBasicAutoFormat.podman.nix b/testdata/TestBasicAutoFormat.podman.nix
@@ -48,9 +48,6 @@
       "--cpus=1"
       "--dns=1.1.1.1"
       "--health-cmd=curl -f http://localhost/\${POTATO}"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--memory-reservation=524288000b"
       "--memory=1048576000b"
       "--network=container:myproject-sabnzbd"
@@ -97,9 +94,6 @@
     extraOptions = [
       "--health-cmd=curl -f http://localhost/"
       "--hostname=sabnzbd"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network-alias=sabnzbd"
       "--network=myproject_default"
     ];
@@ -146,9 +140,6 @@
       "--health-start-period=40s"
       "--health-startup-interval=5s"
       "--health-timeout=10s"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=host"
     ];
   };
@@ -260,12 +251,7 @@
     };
     dependsOn = [ "sabnzbd" ];
     log-driver = "journald";
-    extraOptions = [
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
-      "--network=container:sabnzbd"
-    ];
+    extraOptions = [ "--network=container:sabnzbd" ];
   };
   systemd.services."podman-traefik" = {
     serviceConfig = {

diff --git a/testdata/TestNoWriteNixSetup.docker.nix b/testdata/TestNoWriteNixSetup.docker.nix
@@ -31,9 +31,6 @@
       "--cpus=1"
       "--dns=1.1.1.1"
       "--health-cmd=curl -f http://localhost/\${POTATO}"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--memory-reservation=524288000b"
       "--memory=1048576000b"
       "--network=container:myproject-sabnzbd"
@@ -85,9 +82,6 @@
     extraOptions = [
       "--health-cmd=curl -f http://localhost/"
       "--hostname=sabnzbd"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network-alias=sabnzbd"
       "--network=myproject_default"
     ];
@@ -136,9 +130,6 @@
       "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=host"
     ];
   };
@@ -263,9 +254,6 @@
     log-driver = "journald";
     autoStart = false;
     extraOptions = [
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=container:sabnzbd"
     ];
   };

diff --git a/testdata/TestNoWriteNixSetup.podman.nix b/testdata/TestNoWriteNixSetup.podman.nix
@@ -31,9 +31,6 @@
       "--cpus=1"
       "--dns=1.1.1.1"
       "--health-cmd=curl -f http://localhost/\${POTATO}"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--memory-reservation=524288000b"
       "--memory=1048576000b"
       "--network=container:myproject-sabnzbd"
@@ -83,9 +80,6 @@
     extraOptions = [
       "--health-cmd=curl -f http://localhost/"
       "--hostname=sabnzbd"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network-alias=sabnzbd"
       "--network=myproject_default"
     ];
@@ -131,9 +125,6 @@
       "--health-start-period=40s"
       "--health-startup-interval=5s"
       "--health-timeout=10s"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=host"
     ];
   };
@@ -255,9 +246,6 @@
     log-driver = "journald";
     autoStart = false;
     extraOptions = [
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=container:sabnzbd"
     ];
   };

diff --git a/testdata/TestOverrideSystemdStopTimeout.docker.nix b/testdata/TestOverrideSystemdStopTimeout.docker.nix
@@ -37,9 +37,6 @@
       "--cpus=1"
       "--dns=1.1.1.1"
       "--health-cmd=curl -f http://localhost/\${POTATO}"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--memory-reservation=524288000b"
       "--memory=1048576000b"
       "--network=container:myproject-sabnzbd"
@@ -92,9 +89,6 @@
     extraOptions = [
       "--health-cmd=curl -f http://localhost/"
       "--hostname=sabnzbd"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network-alias=sabnzbd"
       "--network=myproject_default"
     ];
@@ -144,9 +138,6 @@
       "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=host"
     ];
   };
@@ -273,9 +264,6 @@
     log-driver = "journald";
     autoStart = false;
     extraOptions = [
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=container:sabnzbd"
     ];
   };

diff --git a/testdata/TestOverrideSystemdStopTimeout.podman.nix b/testdata/TestOverrideSystemdStopTimeout.podman.nix
@@ -47,9 +47,6 @@
       "--cpus=1"
       "--dns=1.1.1.1"
       "--health-cmd=curl -f http://localhost/\${POTATO}"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--memory-reservation=524288000b"
       "--memory=1048576000b"
       "--network=container:myproject-sabnzbd"
@@ -100,9 +97,6 @@
     extraOptions = [
       "--health-cmd=curl -f http://localhost/"
       "--hostname=sabnzbd"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network-alias=sabnzbd"
       "--network=myproject_default"
     ];
@@ -149,9 +143,6 @@
       "--health-start-period=40s"
       "--health-startup-interval=5s"
       "--health-timeout=10s"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=host"
     ];
   };
@@ -275,9 +266,6 @@
     log-driver = "journald";
     autoStart = false;
     extraOptions = [
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=container:sabnzbd"
     ];
   };

diff --git a/testdata/TestProject.docker.nix b/testdata/TestProject.docker.nix
@@ -37,9 +37,6 @@
       "--cpus=1"
       "--dns=1.1.1.1"
       "--health-cmd=curl -f http://localhost/\${POTATO}"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--memory-reservation=524288000b"
       "--memory=1048576000b"
       "--network=container:myproject-sabnzbd"
@@ -91,9 +88,6 @@
     extraOptions = [
       "--health-cmd=curl -f http://localhost/"
       "--hostname=sabnzbd"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network-alias=sabnzbd"
       "--network=myproject_default"
     ];
@@ -142,9 +136,6 @@
       "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=host"
     ];
   };
@@ -269,9 +260,6 @@
     log-driver = "journald";
     autoStart = false;
     extraOptions = [
-      "--log-opt=compress=true"
-      "--log-opt=max-file=3"
-      "--log-opt=max-size=10m"
       "--network=container:sabnzbd"
     ];
   };