Skip to content

Commit d09e69c

Browse files
smirasmira
committed
feat: update dependencies
Pin the alpine image reference. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 04ad303 commit d09e69c

File tree

9 files changed

+71
-92
lines changed

9 files changed

+71
-92
lines changed

‎.golangci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-01-29T09:45:00Z by kres 987bf4d.
3+
# Generated on 2025-03-21T11:28:29Z by kres ec5ec04.
44

55
# options for analysis running
66
run:
@@ -133,7 +133,6 @@ linters:
133133
- perfsprint # complains about us using fmt.Sprintf in non-performance critical code, updating just kres took too long
134134
- goimports # same as gci
135135
- musttag # seems to be broken - goes into imported libraries and reports issues there
136-
- exportloopref # WARN The linter 'exportloopref' is deprecated (since v1.60.2) due to: Since Go1.22 (loopvar) this linter is no longer relevant. Replaced by copyloopvar.
137136

138137
issues:
139138
exclude: [ ]

‎Dockerfile

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
# syntax = docker/dockerfile-upstream:1.12.1-labs
1+
# syntax = docker/dockerfile-upstream:1.14.1-labs
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2025-01-29T09:45:00Z by kres 987bf4d.
5+
# Generated on 2025-03-21T11:28:29Z by kres ec5ec04.
66

77
ARG TOOLCHAIN
88

9-
FROM ghcr.io/siderolabs/ca-certificates:v1.9.0 AS image-ca-certificates
9+
FROM ghcr.io/siderolabs/ca-certificates:v1.10.0-alpha.0-37-g359807b AS image-ca-certificates
1010

11-
FROM ghcr.io/siderolabs/fhs:v1.9.0 AS image-fhs
11+
FROM ghcr.io/siderolabs/fhs:v1.10.0-alpha.0-37-g359807b AS image-fhs
1212

1313
# runs markdownlint
14-
FROM docker.io/oven/bun:1.1.43-alpine AS lint-markdown
14+
FROM docker.io/oven/bun:1.2.4-alpine AS lint-markdown
1515
WORKDIR /src
16-
RUN bun i markdownlint-cli@0.43.0 [email protected]
16+
RUN bun i markdownlint-cli@0.44.0 [email protected]
1717
COPY .markdownlint.json .
1818
COPY ./CHANGELOG.md ./CHANGELOG.md
1919
COPY ./README.md ./README.md
@@ -34,12 +34,12 @@ ARG GOEXPERIMENT
3434
ENV GOEXPERIMENT=${GOEXPERIMENT}
3535
ENV GOPATH=/go
3636
ARG DEEPCOPY_VERSION
37-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg go install github.com/siderolabs/deep-copy@${DEEPCOPY_VERSION} \
37+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg go install github.com/siderolabs/deep-copy@${DEEPCOPY_VERSION} \
3838
&& mv /go/bin/deep-copy /bin/deep-copy
3939
ARG GOLANGCILINT_VERSION
40-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCILINT_VERSION} \
40+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCILINT_VERSION} \
4141
&& mv /go/bin/golangci-lint /bin/golangci-lint
42-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg go install golang.org/x/vuln/cmd/govulncheck@latest \
42+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg go install golang.org/x/vuln/cmd/govulncheck@latest \
4343
&& mv /go/bin/govulncheck /bin/govulncheck
4444
ARG GOFUMPT_VERSION
4545
RUN go install mvdan.cc/gofumpt@${GOFUMPT_VERSION} \
@@ -51,11 +51,11 @@ WORKDIR /src
5151
COPY go.mod go.mod
5252
COPY go.sum go.sum
5353
RUN cd .
54-
RUN --mount=type=cache,target=/go/pkg go mod download
55-
RUN --mount=type=cache,target=/go/pkg go mod verify
54+
RUN --mount=type=cache,target=/go/pkg,id=bldr/go/pkg go mod download
55+
RUN --mount=type=cache,target=/go/pkg,id=bldr/go/pkg go mod verify
5656
COPY ./cmd ./cmd
5757
COPY ./internal ./internal
58-
RUN --mount=type=cache,target=/go/pkg go list -mod=readonly all >/dev/null
58+
RUN --mount=type=cache,target=/go/pkg,id=bldr/go/pkg go list -mod=readonly all >/dev/null
5959

6060
FROM tools AS embed-generate
6161
ARG SHA
@@ -71,7 +71,7 @@ ARG REGISTRY
7171
ARG USERNAME
7272
ARG TAG
7373
ARG VERSION_PKG="github.com/siderolabs/bldr/internal/pkg/constants"
74-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg go test -c -tags integration -ldflags "-s -w -X ${VERSION_PKG}.Version=${TAG} -X ${VERSION_PKG}.DefaultOrganization=${USERNAME} -X ${VERSION_PKG}.DefaultRegistry=${REGISTRY}" ./internal/pkg/integration
74+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg go test -c -tags integration -ldflags "-s -w -X ${VERSION_PKG}.Version=${TAG} -X ${VERSION_PKG}.DefaultOrganization=${USERNAME} -X ${VERSION_PKG}.DefaultRegistry=${REGISTRY}" ./internal/pkg/integration
7575

7676
# runs gofumpt
7777
FROM base AS lint-gofumpt
@@ -83,24 +83,24 @@ WORKDIR /src
8383
COPY .golangci.yml .
8484
ENV GOGC=50
8585
RUN golangci-lint config verify --config .golangci.yml
86-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/root/.cache/golangci-lint --mount=type=cache,target=/go/pkg golangci-lint run --config .golangci.yml
86+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/root/.cache/golangci-lint,id=bldr/root/.cache/golangci-lint,sharing=locked --mount=type=cache,target=/go/pkg,id=bldr/go/pkg golangci-lint run --config .golangci.yml
8787

8888
# runs govulncheck
8989
FROM base AS lint-govulncheck
9090
WORKDIR /src
91-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg govulncheck ./...
91+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg govulncheck ./...
9292

9393
# runs unit-tests with race detector
9494
FROM base AS unit-tests-race
9595
WORKDIR /src
9696
ARG TESTPKGS
97-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg --mount=type=cache,target=/tmp CGO_ENABLED=1 go test -v -race -count 1 ${TESTPKGS}
97+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg --mount=type=cache,target=/tmp,id=bldr/tmp CGO_ENABLED=1 go test -v -race -count 1 ${TESTPKGS}
9898

9999
# runs unit-tests
100100
FROM base AS unit-tests-run
101101
WORKDIR /src
102102
ARG TESTPKGS
103-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg --mount=type=cache,target=/tmp go test -v -covermode=atomic -coverprofile=coverage.txt -coverpkg=${TESTPKGS} -count 1 ${TESTPKGS}
103+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg --mount=type=cache,target=/tmp,id=bldr/tmp go test -v -covermode=atomic -coverprofile=coverage.txt -coverpkg=${TESTPKGS} -count 1 ${TESTPKGS}
104104

105105
FROM embed-generate AS embed-abbrev-generate
106106
WORKDIR /src
@@ -129,7 +129,7 @@ ARG GO_LDFLAGS
129129
ARG VERSION_PKG="internal/version"
130130
ARG SHA
131131
ARG TAG
132-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=amd64 GOOS=darwin go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=bldr -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /bldr-darwin-amd64
132+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg GOARCH=amd64 GOOS=darwin go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=bldr -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /bldr-darwin-amd64
133133

134134
# builds bldr-darwin-arm64
135135
FROM base AS bldr-darwin-arm64-build
@@ -141,7 +141,7 @@ ARG GO_LDFLAGS
141141
ARG VERSION_PKG="internal/version"
142142
ARG SHA
143143
ARG TAG
144-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=arm64 GOOS=darwin go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=bldr -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /bldr-darwin-arm64
144+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg GOARCH=arm64 GOOS=darwin go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=bldr -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /bldr-darwin-arm64
145145

146146
# builds bldr-linux-amd64
147147
FROM base AS bldr-linux-amd64-build
@@ -153,7 +153,7 @@ ARG GO_LDFLAGS
153153
ARG VERSION_PKG="internal/version"
154154
ARG SHA
155155
ARG TAG
156-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=amd64 GOOS=linux go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=bldr -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /bldr-linux-amd64
156+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg GOARCH=amd64 GOOS=linux go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=bldr -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /bldr-linux-amd64
157157

158158
# builds bldr-linux-arm64
159159
FROM base AS bldr-linux-arm64-build
@@ -165,7 +165,7 @@ ARG GO_LDFLAGS
165165
ARG VERSION_PKG="internal/version"
166166
ARG SHA
167167
ARG TAG
168-
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOARCH=arm64 GOOS=linux go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=bldr -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /bldr-linux-arm64
168+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg GOARCH=arm64 GOOS=linux go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X ${VERSION_PKG}.Name=bldr -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /bldr-linux-arm64
169169

170170
FROM scratch AS bldr-darwin-amd64
171171
COPY --from=bldr-darwin-amd64-build /bldr-darwin-amd64 /bldr-darwin-amd64

‎Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-01-29T09:45:00Z by kres 987bf4d.
3+
# Generated on 2025-03-21T11:28:29Z by kres ec5ec04.
44

55
# common variables
66

@@ -17,19 +17,20 @@ WITH_RACE ?= false
1717
REGISTRY ?= ghcr.io
1818
USERNAME ?= siderolabs
1919
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
20-
PROTOBUF_GO_VERSION ?= 1.36.2
20+
PROTOBUF_GO_VERSION ?= 1.36.5
2121
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.25.1
22+
GRPC_GATEWAY_VERSION ?= 2.26.3
2323
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.29.0
24+
GOIMPORTS_VERSION ?= 0.31.0
2525
DEEPCOPY_VERSION ?= v0.5.6
26-
GOLANGCILINT_VERSION ?= v1.63.4
26+
GOLANGCILINT_VERSION ?= v1.64.6
2727
GOFUMPT_VERSION ?= v0.7.0
28-
GO_VERSION ?= 1.23.5
28+
GO_VERSION ?= 1.24.1
2929
GO_BUILDFLAGS ?=
3030
GO_LDFLAGS ?=
3131
CGO_ENABLED ?= 0
3232
GOTOOLCHAIN ?= local
33+
GOEXPERIMENT ?= synctest
3334
TESTPKGS ?= ./...
3435
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
3536
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
@@ -69,7 +70,7 @@ COMMON_ARGS += --build-arg=DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)"
6970
COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
7071
COMMON_ARGS += --build-arg=GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
7172
COMMON_ARGS += --build-arg=TESTPKGS="$(TESTPKGS)"
72-
TOOLCHAIN ?= docker.io/golang:1.23-alpine
73+
TOOLCHAIN ?= docker.io/golang:1.24-alpine
7374

7475
# extra variables
7576

‎go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
module github.com/siderolabs/bldr
22

3-
go 1.23.4
3+
go 1.24.0
44

55
require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/Masterminds/sprig/v3 v3.3.0
88
github.com/containerd/platforms v1.0.0-rc.1
9-
github.com/emicklei/dot v1.6.4
9+
github.com/emicklei/dot v1.8.0
1010
github.com/google/go-github/v67 v67.0.0
1111
github.com/hashicorp/go-multierror v1.1.1
12-
github.com/moby/buildkit v0.19.0
12+
github.com/moby/buildkit v0.20.1
1313
github.com/moby/docker-image-spec v1.3.1
1414
github.com/opencontainers/go-digest v1.0.0
15-
github.com/opencontainers/image-spec v1.1.0
15+
github.com/opencontainers/image-spec v1.1.1
1616
github.com/otiai10/copy v1.14.1
1717
github.com/siderolabs/gen v0.8.0
18-
github.com/spf13/cobra v1.8.1
18+
github.com/spf13/cobra v1.9.1
1919
github.com/stretchr/testify v1.10.0
20-
golang.org/x/oauth2 v0.26.0
21-
golang.org/x/sync v0.11.0
20+
golang.org/x/oauth2 v0.28.0
21+
golang.org/x/sync v0.12.0
2222
gopkg.in/yaml.v3 v3.0.1
2323
)
2424

@@ -27,7 +27,7 @@ require (
2727
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
2828
github.com/Masterminds/goutils v1.1.1 // indirect
2929
github.com/Masterminds/semver/v3 v3.3.0 // indirect
30-
github.com/containerd/containerd/v2 v2.0.2 // indirect
30+
github.com/containerd/containerd/v2 v2.0.4 // indirect
3131
github.com/containerd/errdefs v1.0.0 // indirect
3232
github.com/containerd/log v0.1.0 // indirect
3333
github.com/containerd/ttrpc v1.2.7 // indirect
@@ -60,7 +60,7 @@ require (
6060
github.com/shopspring/decimal v1.4.0 // indirect
6161
github.com/sirupsen/logrus v1.9.3 // indirect
6262
github.com/spf13/cast v1.7.0 // indirect
63-
github.com/spf13/pflag v1.0.5 // indirect
63+
github.com/spf13/pflag v1.0.6 // indirect
6464
github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a // indirect
6565
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
6666
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 // indirect
@@ -71,10 +71,10 @@ require (
7171
go.opentelemetry.io/otel/trace v1.31.0 // indirect
7272
golang.org/x/crypto v0.31.0 // indirect
7373
golang.org/x/net v0.33.0 // indirect
74-
golang.org/x/sys v0.28.0 // indirect
74+
golang.org/x/sys v0.29.0 // indirect
7575
golang.org/x/text v0.21.0 // indirect
7676
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
77-
google.golang.org/grpc v1.68.1 // indirect
77+
google.golang.org/grpc v1.69.4 // indirect
7878
google.golang.org/protobuf v1.35.2 // indirect
7979
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
8080
)

0 commit comments

Comments
 (0)