From 305a190b73eb761e074a2ed7ac085de04cf4e655 Mon Sep 17 00:00:00 2001 From: Assil Ksiksi Date: Mon, 7 Oct 2024 08:48:15 -0400 Subject: [PATCH] fix: only set log opts if driver is set --- compose.go | 6 ++---- testdata/TestBasic.docker.nix | 12 ------------ testdata/TestBasic.podman.nix | 12 ------------ testdata/TestBasicAutoFormat.docker.nix | 16 +--------------- testdata/TestBasicAutoFormat.podman.nix | 16 +--------------- testdata/TestNoWriteNixSetup.docker.nix | 12 ------------ testdata/TestNoWriteNixSetup.podman.nix | 12 ------------ .../TestOverrideSystemdStopTimeout.docker.nix | 12 ------------ .../TestOverrideSystemdStopTimeout.podman.nix | 12 ------------ testdata/TestProject.docker.nix | 12 ------------ testdata/TestProject.podman.nix | 12 ------------ testdata/TestRemoveVolumes.docker.nix | 12 ------------ testdata/TestRemoveVolumes.podman.nix | 12 ------------ testdata/TestSystemdMount.docker.nix | 12 ------------ testdata/TestSystemdMount.podman.nix | 12 ------------ testdata/TestUpheldBy.docker.nix | 12 ------------ testdata/TestUpheldBy.podman.nix | 12 ------------ 17 files changed, 4 insertions(+), 202 deletions(-) diff --git a/compose.go b/compose.go index 4848f63..d7afb68 100644 --- 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 index 1ee3aa4..63f3765 100644 --- 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 index ef95d91..793108f 100644 --- 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 index 47a50be..1e06619 100644 --- 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 index 4c786b5..a177511 100644 --- 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 index 32b9073..b6b1e7e 100644 --- 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 index f75f144..e30b4d5 100644 --- 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 index b2019aa..2b50d62 100644 --- 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 index 98c0bb6..081d1de 100644 --- 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 index 571cad6..9690353 100644 --- 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" ]; }; diff --git a/testdata/TestProject.podman.nix b/testdata/TestProject.podman.nix index fa24e3f..89c8fcb 100644 --- a/testdata/TestProject.podman.nix +++ b/testdata/TestProject.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" @@ -99,9 +96,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" ]; @@ -147,9 +141,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" ]; }; @@ -271,9 +262,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/TestRemoveVolumes.docker.nix b/testdata/TestRemoveVolumes.docker.nix index 5dc7e35..2c6be52 100644 --- a/testdata/TestRemoveVolumes.docker.nix +++ b/testdata/TestRemoveVolumes.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" ]; }; diff --git a/testdata/TestRemoveVolumes.podman.nix b/testdata/TestRemoveVolumes.podman.nix index f8d3c2b..ce82b47 100644 --- a/testdata/TestRemoveVolumes.podman.nix +++ b/testdata/TestRemoveVolumes.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" @@ -99,9 +96,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" ]; @@ -147,9 +141,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" ]; }; @@ -271,9 +262,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/TestSystemdMount.docker.nix b/testdata/TestSystemdMount.docker.nix index 85db50c..d94410e 100644 --- a/testdata/TestSystemdMount.docker.nix +++ b/testdata/TestSystemdMount.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" @@ -94,9 +91,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" ]; @@ -148,9 +142,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"; autoStart = false; extraOptions = [ - "--log-opt=compress=true" - "--log-opt=max-file=3" - "--log-opt=max-size=10m" "--network=container:sabnzbd" ]; }; diff --git a/testdata/TestSystemdMount.podman.nix b/testdata/TestSystemdMount.podman.nix index b94d5ba..1297af2 100644 --- a/testdata/TestSystemdMount.podman.nix +++ b/testdata/TestSystemdMount.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" @@ -102,9 +99,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" ]; @@ -153,9 +147,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"; autoStart = false; extraOptions = [ - "--log-opt=compress=true" - "--log-opt=max-file=3" - "--log-opt=max-size=10m" "--network=container:sabnzbd" ]; }; diff --git a/testdata/TestUpheldBy.docker.nix b/testdata/TestUpheldBy.docker.nix index c884640..9c25ac5 100644 --- a/testdata/TestUpheldBy.docker.nix +++ b/testdata/TestUpheldBy.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" @@ -94,9 +91,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" ]; @@ -145,9 +139,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" ]; }; @@ -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/TestUpheldBy.podman.nix b/testdata/TestUpheldBy.podman.nix index ca8f378..6d5c831 100644 --- a/testdata/TestUpheldBy.podman.nix +++ b/testdata/TestUpheldBy.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" @@ -102,9 +99,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" ]; @@ -150,9 +144,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" ]; }; @@ -277,9 +268,6 @@ log-driver = "journald"; autoStart = false; extraOptions = [ - "--log-opt=compress=true" - "--log-opt=max-file=3" - "--log-opt=max-size=10m" "--network=container:sabnzbd" ]; };