Merge pull request #6452 from crazy-max/alpine-3.23

update alpine to 3.23

Author: tonistiigi

Dockerfile

@@ -19,7 +19,7 @@ ARG GOTESTSUM_VERSION=v1.13.0
 ARG DELVE_VERSION=v1.25.2
 
 ARG EXPORT_BASE=alpine
-ARG ALPINE_VERSION=3.22
+ARG ALPINE_VERSION=3.23
 ARG UBUNTU_VERSION=24.04
 
 ARG GO_VERSION=1.25

hack/dockerfiles/archutil.Dockerfile

@@ -2,7 +2,7 @@
 # check=error=true
 
 ARG GO_VERSION=1.25
-ARG ALPINE_VERSION=3.22
+ARG ALPINE_VERSION=3.23
 ARG DEBIAN_VERSION=trixie
 
 ARG BUILD_LOONG64=${TARGETPLATFORM#linux/amd64}

hack/dockerfiles/authors.Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile-upstream:master
 
-ARG ALPINE_VERSION=3.22
+ARG ALPINE_VERSION=3.23
 
 FROM alpine:${ALPINE_VERSION} AS gen
 RUN apk add --no-cache git

hack/dockerfiles/docs-dockerfile.Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG GO_VERSION=1.25
-ARG ALPINE_VERSION=3.22
+ARG ALPINE_VERSION=3.23
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest
 

hack/dockerfiles/docs.Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG GO_VERSION=1.25
-ARG ALPINE_VERSION=3.22
+ARG ALPINE_VERSION=3.23
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golatest
 

hack/dockerfiles/lint.Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile-upstream:master
 
 ARG GO_VERSION=1.25
-ARG ALPINE_VERSION=3.22
+ARG ALPINE_VERSION=3.23
 ARG XX_VERSION=1.6.1
 ARG PROTOLINT_VERSION=0.50.5
 ARG GOLANGCI_LINT_VERSION=v2.1.5

hack/dockerfiles/vendor.Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile-upstream:master
 
 ARG GO_VERSION=1.25
-ARG ALPINE_VERSION=3.22
+ARG ALPINE_VERSION=3.23
 ARG MODOUTDATED_VERSION=v0.9.0
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base

source/git/source.go

@@ -904,7 +904,7 @@ func (gs *gitSourceHandler) tryRemoteFetch(ctx context.Context, g session.Group,
 				// only hope is to abandon the existing shared repo and start a fresh one
 				return nil, &wouldClobberExistingTagError{err}
 			}
-			if strings.Contains(err.Error(), "(unable to update local ref)") && strings.Contains(err.Error(), "some local refs could not be updated;") {
+			if isUnableToUpdateLocalRef(err) {
 				// this can happen if a branch updated in remote so that old branch
 				// is now a parent dir of a new branch
 				return nil, &unableToUpdateLocalRefError{err}
@@ -1156,6 +1156,18 @@ func (e *unableToUpdateLocalRefError) Unwrap() error {
 	return e.error
 }
 
+func isUnableToUpdateLocalRef(err error) bool {
+	if err == nil {
+		return false
+	}
+	msg := err.Error()
+	if !strings.Contains(msg, "some local refs could not be updated;") {
+		return false
+	}
+	return strings.Contains(msg, "(unable to update local ref)") ||
+		strings.Contains(msg, "refname conflict")
+}
+
 func (gs *gitSourceHandler) emptyGitCli(ctx context.Context, g session.Group, opts ...gitutil.Option) (*gitutil.GitCLI, func() error, error) {
 	var cleanups []func() error
 	cleanup := func() error {