Skip to content

Commit 84e9247

Browse files
crazy-maxcrazy-max
committed
update to go 1.23
Signed-off-by: CrazyMax <[email protected]>
1 parent 85908cc commit 84e9247

File tree

7 files changed

+30
-21
lines changed

7 files changed

+30
-21
lines changed

‎.golangci.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
run:
22
timeout: 10m
3-
skip-files:
4-
- ".*\\.pb\\.go$"
53
modules-download-mode: vendor
4+
# default uses Go version from the go.mod file, fallback on the env var
5+
# `GOVERSION`, fallback on 1.17: https://golangci-lint.run/usage/configuration/#run-configuration
6+
go: "1.23"
67

78
linters:
89
enable:
@@ -50,6 +51,6 @@ issues:
5051
- revive
5152
text: "if-return"
5253

53-
# show all
54-
max-issues-per-linter: 0
55-
max-same-issues: 0
54+
# show all
55+
max-issues-per-linter: 0
56+
max-same-issues: 0

‎Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG GO_VERSION=1.21
4-
ARG ALPINE_VERSION=3.20
5-
ARG XX_VERSION=1.5.0
3+
ARG GO_VERSION=1.23
4+
ARG ALPINE_VERSION=3.21
5+
ARG XX_VERSION=1.6.1
66

77
ARG QEMU_VERSION=HEAD
88
ARG QEMU_REPO=https://github.com/qemu/qemu
@@ -82,7 +82,7 @@ RUN --mount=target=.,from=src,src=/src/qemu,rw --mount=target=./install-scripts,
8282
ARG BINARY_PREFIX
8383
RUN cd /usr/bin; [ -z "$BINARY_PREFIX" ] || for f in $(ls qemu-*); do ln -s $f $BINARY_PREFIX$f; done
8484

85-
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS binfmt
85+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS binfmt
8686
COPY --from=xx / /
8787
ENV CGO_ENABLED=0
8888
ARG TARGETPLATFORM
@@ -146,7 +146,7 @@ RUN <<eof
146146
eof
147147

148148
# buildkit-test runs test suite for buildkit embedded QEMU
149-
FROM golang:${GO_VERSION}-alpine AS buildkit-test
149+
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS buildkit-test
150150
RUN apk add --no-cache bash bats
151151
WORKDIR /work
152152
COPY --from=assert . .

‎cmd/binfmt/main.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,12 @@ func install(arch string) error {
6868
register := filepath.Join(mount, "register")
6969
file, err := os.OpenFile(register, os.O_WRONLY, 0)
7070
if err != nil {
71-
e, ok := err.(*os.PathError)
72-
if ok && e.Err == syscall.ENOENT {
71+
var pathErr *os.PathError
72+
ok := errors.As(err, &pathErr)
73+
if ok && errors.Is(pathErr.Err, syscall.ENOENT) {
7374
return errors.Errorf("ENOENT opening %s is it mounted?", register)
7475
}
75-
if ok && e.Err == syscall.EPERM {
76+
if ok && errors.Is(pathErr.Err, syscall.EPERM) {
7677
return errors.Errorf("EPERM opening %s check permissions?", register)
7778
}
7879
return errors.Errorf("Cannot open %s: %s", register, err)
@@ -93,8 +94,8 @@ func install(arch string) error {
9394
// short writes should not occur on sysfs, cannot usefully recover
9495
_, err = file.Write([]byte(line))
9596
if err != nil {
96-
e, ok := err.(*os.PathError)
97-
if ok && e.Err == syscall.EEXIST {
97+
var pathErr *os.PathError
98+
if errors.As(err, &pathErr) && errors.Is(pathErr.Err, syscall.EEXIST) {
9899
return errors.Errorf("%s already registered", binaryBasename)
99100
}
100101
return errors.Errorf("cannot register %q to %s: %s", binaryFullpath, register, err)

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/tonistiigi/binfmt
22

3-
go 1.20
3+
go 1.23.0
44

55
require (
66
github.com/containerd/containerd v1.7.11

‎go.sum

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
1212
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
1313
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1414
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
15+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1516
github.com/moby/buildkit v0.12.5 h1:RNHH1l3HDhYyZafr5EgstEu8aGNCwyfvMtrQDtjH9T0=
1617
github.com/moby/buildkit v0.12.5/go.mod h1:YGwjA2loqyiYfZeEo8FtI7z4x5XponAaIWsWcSjWwso=
1718
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -27,17 +28,20 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
2728
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
2829
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2930
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
31+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
3032
github.com/tonistiigi/go-archvariant v1.0.0 h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0=
3133
github.com/tonistiigi/go-archvariant v1.0.0/go.mod h1:TxFmO5VS6vMq2kvs3ht04iPXtu2rUT/erOnGFYfk5Ho=
3234
go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
3335
go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
3436
go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
3537
go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
3638
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
39+
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
3740
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3841
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
3942
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4043
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
44+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
4145
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4246
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
4347
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
@@ -50,3 +54,4 @@ google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
5054
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5155
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5256
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
57+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎hack/dockerfiles/lint.Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG GO_VERSION=1.21
3+
ARG GO_VERSION=1.23
4+
ARG ALPINE_VERSION=3.21
45

5-
FROM golang:${GO_VERSION}-alpine
6+
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION}
67
RUN apk add --no-cache gcc musl-dev
7-
RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.54.2
8+
RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.62.0
89
WORKDIR /go/src/github.com/tonistiigi/binfmt
910
RUN --mount=target=. --mount=target=/root/.cache,type=cache \
1011
golangci-lint run

‎hack/dockerfiles/vendor.Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG GO_VERSION=1.21
3+
ARG GO_VERSION=1.23
4+
ARG ALPINE_VERSION=3.21
45

5-
FROM golang:${GO_VERSION}-alpine AS vendored
6+
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS vendored
67
RUN apk add --no-cache git
78
WORKDIR /src
89
RUN --mount=target=/src,rw \

0 commit comments

Comments
 (0)