From a54b8d01ae95e44399b2cb71862fee17c8f5bc7e Mon Sep 17 00:00:00 2001 From: Govind Menon Date: Wed, 27 May 2026 01:14:58 +0530 Subject: [PATCH 1/2] Bump Go from 1.25.9 to 1.25.10 --- Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c6de91..c01b3fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.9 AS binary +FROM golang:1.25.10 AS binary WORKDIR /go/src/github.com/jwilder/dockerize COPY *.go go.* /go/src/github.com/jwilder/dockerize/ diff --git a/go.mod b/go.mod index 08e7113..a8c2b9e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jwilder/dockerize -go 1.25.9 +go 1.25.10 require ( github.com/Masterminds/sprig/v3 v3.3.0 From 7ec93ecd64179eb3406cfa880c9a13212be0b201 Mon Sep 17 00:00:00 2001 From: Govind Menon Date: Wed, 27 May 2026 01:22:00 +0530 Subject: [PATCH 2/2] fix: resolve code linting and formatting issues --- exec.go | 2 +- main.go | 2 +- tail.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exec.go b/exec.go index b5ca852..b0c04cf 100644 --- a/exec.go +++ b/exec.go @@ -1,6 +1,7 @@ package main import ( + "context" "errors" "log" "os" @@ -9,7 +10,6 @@ import ( "syscall" "time" - "golang.org/x/net/context" ) func runCmd(ctx context.Context, cancel context.CancelFunc, cmd string, args ...string) { diff --git a/main.go b/main.go index 1641153..1640277 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "context" "flag" "fmt" "io" @@ -13,7 +14,6 @@ import ( "sync" "time" - "golang.org/x/net/context" ) const defaultWaitRetryInterval = time.Second diff --git a/tail.go b/tail.go index 4538038..3f09856 100644 --- a/tail.go +++ b/tail.go @@ -1,13 +1,13 @@ package main import ( + "context" "fmt" "log" "os" "time" "github.com/hpcloud/tail" - "golang.org/x/net/context" ) func tailFile(ctx context.Context, file string, poll bool, dest *os.File) {