From e375705753bbed669a7cf7b4cf924965939ffbae Mon Sep 17 00:00:00 2001 From: alinashklyar Date: Fri, 26 Jun 2026 11:48:30 +0400 Subject: [PATCH 1/3] update docker version and alpine --- Dockerfile | 10 +++++----- service.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0fbe97c..154e97c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # CI relies on this ARG. Don't remove or rename it -ARG DOCKER_VERSION=29.5.3 +ARG DOCKER_VERSION=29.6.0 # dind-cleaner -FROM golang:1.26-alpine3.23 AS cleaner +FROM golang:1.26-alpine3.24 AS cleaner COPY cleaner/dind-cleaner/* /go/src/github.com/codefresh-io/dind-cleaner/ WORKDIR /go/src/github.com/codefresh-io/dind-cleaner/ RUN go mod tidy @@ -13,13 +13,13 @@ RUN CGO_ENABLED=0 go build -o /usr/local/bin/dind-cleaner ./cmd \ # bbolt -FROM golang:1.26-alpine3.23 AS bbolt +FROM golang:1.26-alpine3.24 AS bbolt RUN go install go.etcd.io/bbolt/cmd/bbolt@latest # Main FROM docker:${DOCKER_VERSION}-dind AS prod -RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main' >> /etc/apk/repositories \ +RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.24/main' >> /etc/apk/repositories \ && apk upgrade && apk add --no-cache \ bash \ # Add fuse-overlayfs for compatibility with rootless. Volumes created with rootless might use fuse-overlay formatted volumes. If those volumes are later used by dind that runs with root it'll require fuse-overlay to be able to read the volume @@ -31,7 +31,7 @@ RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main' >> /etc/apk/repositor RUN update-alternatives --install $(which iptables) iptables $(which iptables-legacy) 10 \ && update-alternatives --install $(which ip6tables) ip6tables $(which ip6tables-legacy) 10 # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-node-exporter -COPY --from=docker.io/octopusdeploy/dhi-node-exporter:1.11.1-alpine3.23@sha256:8cd8b3f56f6c319a03c7a2224e99d07e34241ae9ced308df5a6fee41d61ea905 /usr/bin/node_exporter /bin/ +COPY --from=docker.io/octopusdeploy/dhi-node-exporter:1.11.1-alpine3.23@sha256:7d2ec764517c233918d46e6da50128ac9ebc7ec3f0bbcf6846042de67cb22757 /usr/bin/node_exporter /bin/ COPY --from=bbolt /go/bin/bbolt /bin/ COPY --from=cleaner /usr/local/bin/dind-cleaner /bin/ diff --git a/service.yaml b/service.yaml index 270013b..6caec54 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 3.0.17 +version: 3.0.18 From 8ba48465fae994245fcba67186a2d439a74121fd Mon Sep 17 00:00:00 2001 From: alinashklyar Date: Wed, 1 Jul 2026 12:55:34 +0400 Subject: [PATCH 2/3] update DHI' --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7af8193..2e2e1e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,12 @@ RUN CGO_ENABLED=0 go build -o /usr/local/bin/dind-cleaner ./cmd \ # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-golang -FROM octopusdeploy/dhi-golang:1.26-alpine3.24-dev@sha256:e48a91483983467f426cae8656aa16be252c6f2e290125e10db01259352a54ca AS bbolt +FROM octopusdeploy/dhi-golang:1.26-alpine3.24-dev@sha256:02e9edbf516c55d7448caef215c0c8eba5d843f101434bfb4359df4cd75cc1df AS bbolt RUN go install go.etcd.io/bbolt/cmd/bbolt@latest # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-node-exporter -FROM octopusdeploy/dhi-node-exporter:1.11.1-alpine3.23@sha256:8cd8b3f56f6c319a03c7a2224e99d07e34241ae9ced308df5a6fee41d61ea905 AS node-exporter +FROM octopusdeploy/dhi-node-exporter:1.11.1-alpine3.24@sha256:f0e1b2c11b903a2454735775eef49c20352693954c6ff16fd6a2da7f5659c24b AS node-exporter FROM docker:${DOCKER_VERSION}-dind AS prod From ba920145b108a5cf772ddecd78e4f5d469cdd086 Mon Sep 17 00:00:00 2001 From: alinashklyar Date: Wed, 1 Jul 2026 12:55:56 +0400 Subject: [PATCH 3/3] bump --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index 6caec54..6eccdbd 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 3.0.18 +version: 3.0.19