diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 025e20dc..ecf20a2d 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,7 +1,7 @@ ARG DOCKER_GEN_VERSION=main # Build docker-gen from scratch -FROM --platform=$BUILDPLATFORM golang:1.24.1-alpine AS go-builder +FROM --platform=$BUILDPLATFORM golang:1.24.3-alpine AS go-builder ENV CGO_ENABLED=0 diff --git a/Dockerfile.debian b/Dockerfile.debian index e61f0f78..c83d202f 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -1,7 +1,7 @@ ARG DOCKER_GEN_VERSION=main # Build docker-gen from scratch -FROM --platform=$BUILDPLATFORM golang:1.24.1 AS go-builder +FROM --platform=$BUILDPLATFORM golang:1.24.3 AS go-builder ENV CGO_ENABLED=0 diff --git a/go.mod b/go.mod index b38afd10..4fbad338 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/shopspring/decimal v1.4.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cast v1.7.0 // indirect - golang.org/x/crypto v0.31.0 // indirect + golang.org/x/crypto v0.35.0 // indirect golang.org/x/sys v0.30.0 // indirect gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect ) diff --git a/go.sum b/go.sum index ab311023..4a70e652 100644 --- a/go.sum +++ b/go.sum @@ -100,8 +100,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= +golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= diff --git a/internal/generator/generator.go b/internal/generator/generator.go index 542e7445..327c99a9 100644 --- a/internal/generator/generator.go +++ b/internal/generator/generator.go @@ -281,7 +281,7 @@ func (g *generator) generateFromEvents() { time.Sleep(10 * time.Second) break } - if event.Status == "start" || event.Status == "stop" || event.Status == "die" || strings.Index(event.Status, "health_status:") != -1 { + if event.Status == "start" || event.Status == "stop" || event.Status == "die" || strings.Contains(event.Status, "health_status:") { log.Printf("Received event %s for container %s", event.Status, event.ID[:12]) // fanout event to all watchers for _, watcher := range watchers {