Skip to content

Commit 0e500d0

Browse files
build: upgrade dependencies (#89)
* build: upgrade base image * build: upgrade dependencies * ci: bump version * build: remove obsolete Dockerfile
1 parent afb8381 commit 0e500d0

File tree

5 files changed

+91
-89
lines changed

5 files changed

+91
-89
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG DOCKER_VERSION=28.1.1
1+
ARG DOCKER_VERSION=28.3.3
22

33
# dind-cleaner
4-
FROM golang:1.24-alpine3.21 AS cleaner
4+
FROM golang:1.25-alpine3.22 AS cleaner
55

66
COPY cleaner/dind-cleaner/* /go/src/github.com/codefresh-io/dind-cleaner/
77
WORKDIR /go/src/github.com/codefresh-io/dind-cleaner/
@@ -15,7 +15,7 @@ RUN CGO_ENABLED=0 go build -o /usr/local/bin/dind-cleaner ./cmd && \
1515
rm -rf /go/*
1616

1717
# bbolt
18-
FROM golang:1.24-alpine3.21 AS bbolt
18+
FROM golang:1.25-alpine3.22 AS bbolt
1919
RUN go install go.etcd.io/bbolt/cmd/bbolt@latest
2020

2121
# node-exporter
@@ -24,7 +24,7 @@ FROM quay.io/prometheus/node-exporter:v1.9.1 AS node-exporter
2424
# Main
2525
FROM docker:${DOCKER_VERSION}-dind
2626

27-
RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.21/main' >> /etc/apk/repositories \
27+
RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main' >> /etc/apk/repositories \
2828
&& apk upgrade \
2929
# Add fuse-overlayfs for comaptibility 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
3030
&& apk add bash fuse-overlayfs jq --no-cache \

Dockerfile.bolter

Lines changed: 0 additions & 4 deletions
This file was deleted.

cleaner/dind-cleaner/go.mod

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
11
module github.com/codefresh-io/dind-cleaner
22

3-
go 1.23.0
4-
5-
toolchain go1.24.2
3+
go 1.25.0
64

75
require (
8-
github.com/docker/docker v28.1.1+incompatible
9-
github.com/golang/glog v1.2.4
10-
golang.org/x/net v0.39.0
6+
github.com/docker/docker v28.3.3+incompatible
7+
github.com/golang/glog v1.2.5
8+
golang.org/x/net v0.43.0
119
)
1210

1311
require (
14-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
1512
github.com/Microsoft/go-winio v0.6.2 // indirect
13+
github.com/containerd/errdefs v1.0.0 // indirect
14+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
1615
github.com/containerd/log v0.1.0 // indirect
1716
github.com/distribution/reference v0.6.0 // indirect
18-
github.com/docker/go-connections v0.5.0 // indirect
17+
github.com/docker/go-connections v0.6.0 // indirect
1918
github.com/docker/go-units v0.5.0 // indirect
2019
github.com/felixge/httpsnoop v1.0.4 // indirect
21-
github.com/go-logr/logr v1.4.2 // indirect
20+
github.com/go-logr/logr v1.4.3 // indirect
2221
github.com/go-logr/stdr v1.2.2 // indirect
2322
github.com/gogo/protobuf v1.3.2 // indirect
24-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
2523
github.com/moby/docker-image-spec v1.3.1 // indirect
2624
github.com/moby/sys/atomicwriter v0.1.0 // indirect
27-
github.com/moby/term v0.5.0 // indirect
25+
github.com/moby/term v0.5.2 // indirect
2826
github.com/morikuni/aec v1.0.0 // indirect
2927
github.com/opencontainers/go-digest v1.0.0 // indirect
30-
github.com/opencontainers/image-spec v1.1.0 // indirect
28+
github.com/opencontainers/image-spec v1.1.1 // indirect
3129
github.com/pkg/errors v0.9.1 // indirect
32-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
33-
go.opentelemetry.io/otel v1.31.0 // indirect
34-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.31.0 // indirect
35-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
36-
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
37-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
38-
golang.org/x/sys v0.32.0 // indirect
39-
golang.org/x/time v0.7.0 // indirect
40-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
41-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
42-
gotest.tools/v3 v3.5.1 // indirect
30+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
31+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
32+
go.opentelemetry.io/otel v1.37.0 // indirect
33+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
34+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
35+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
36+
golang.org/x/sys v0.35.0 // indirect
37+
golang.org/x/time v0.12.0 // indirect
38+
google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect
39+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect
40+
google.golang.org/protobuf v1.36.7 // indirect
41+
gotest.tools/v3 v3.5.2 // indirect
4342
)

0 commit comments

Comments
 (0)