diff --git a/Dockerfile b/Dockerfile index 821ac32406..a7b63f1918 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG DOCKER_VERSION=27.3.1 # -> golang image used solely for building the k3d binary # # -> built executable can then be copied into other stages # ############################################################ -FROM golang:1.22.4 as builder +FROM golang:1.24.4 as builder ARG GIT_TAG_OVERRIDE WORKDIR /app RUN mkdir /tmp/empty diff --git a/pkg/types/fixes/fixes.go b/pkg/types/fixes/fixes.go index e2ca98bae9..50ba39b117 100644 --- a/pkg/types/fixes/fixes.go +++ b/pkg/types/fixes/fixes.go @@ -102,7 +102,18 @@ var fixNeeded = map[K3DFixEnv]func(runtime runtimes.Runtime) bool{ l.Log().Debugf("[autofix cgroupsv2] cgroupVersion: %d", cgroupVersion) return cgroupVersion == 2 }, - EnvFixDNS: func(_ runtimes.Runtime) bool { + EnvFixDNS: func(runtime runtimes.Runtime) bool { + runtimeInfo, err := runtime.Info() + if err != nil { + l.Log().Warnf("Failed to get runtime information: %+v", err) + return false + } + + if runtimeInfo.InfoName == "colima" { + l.Log().Debug("Skipping the DNS fix on Colima.") + return false + } + return true }, EnvFixMounts: func(_ runtimes.Runtime) bool { diff --git a/tools/Dockerfile b/tools/Dockerfile index c30f5afe8c..8917daadc5 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4-alpine3.20 AS builder +FROM golang:1.24.3-alpine3.20 AS builder ARG GIT_TAG WORKDIR /app COPY . .