Skip to content

Commit c665632

Browse files
committed
Update to Go 1.21.
1 parent 2fd7f68 commit c665632

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile requires DOCKER_BUILDKIT=1 to be build.
22
# We do not use syntax header so that we do not have to wait
33
# for the Dockerfile frontend image to be pulled.
4-
FROM golang:1.20-alpine3.18 AS build
4+
FROM golang:1.21-alpine3.18 AS build
55

66
RUN apk --update add make git gcc musl-dev
77
COPY . /go/src/dinit
@@ -12,7 +12,7 @@ RUN \
1212

1313
FROM alpine:3.18
1414
RUN apk --no-cache add tzdata bash && \
15-
wget -O /usr/local/bin/regex2json https://gitlab.com/tozd/regex2json/-/releases/v0.2.0/downloads/linux-amd64/regex2json && \
15+
wget -O /usr/local/bin/regex2json https://gitlab.com/tozd/regex2json/-/releases/v0.11.0/downloads/linux-amd64/regex2json && \
1616
chmod +x /usr/local/bin/regex2json
1717
COPY --from=build /go/bin/dinit /
1818
ENTRYPOINT ["/dinit"]

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module gitlab.com/tozd/dinit
22

3-
go 1.20
3+
go 1.21
44

55
require (
6-
gitlab.com/tozd/go/errors v0.5.0
7-
gitlab.com/tozd/go/pcontrol v0.2.0
6+
gitlab.com/tozd/go/errors v0.7.2
7+
gitlab.com/tozd/go/pcontrol v0.3.0
88
golang.org/x/sync v0.2.0
99
golang.org/x/sys v0.9.0
1010
)

go.sum

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
1+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
12
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
23
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
34
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
5+
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
46
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
57
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
68
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
79
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
810
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
911
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
12+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
13+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1014
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
1115
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
12-
gitlab.com/tozd/go/errors v0.5.0 h1:NnCzlYWDC6xaKeM2vkZL6WjPUXiqalVp43CSaYf/5u8=
13-
gitlab.com/tozd/go/errors v0.5.0/go.mod h1:ITSj/0jMirXC20gMbqLNjq2vjXo7rfVi9/f070oN5wY=
14-
gitlab.com/tozd/go/pcontrol v0.2.0 h1:petDGNAVoQHAPkaAcIjbzeXpovMFfI8lrE7gOSfsKYs=
15-
gitlab.com/tozd/go/pcontrol v0.2.0/go.mod h1:6XTajViWa9UAdI9cSUFRK8vs/Rvj4jSwngznUYUjExs=
16+
gitlab.com/tozd/go/errors v0.7.2 h1:nkpU8cxcDZnUhtZ9UPSw2DTNUXEcTaz6KiKLF9p2Fys=
17+
gitlab.com/tozd/go/errors v0.7.2/go.mod h1:PvIdUMLpPwxr+KEBxghQaCMydHXGYdJQn/PhdMqYREY=
18+
gitlab.com/tozd/go/pcontrol v0.3.0 h1:koU2lKcG0YWJCT9yTnFufuRkdAvr/Fvo0gyQmBjwRIE=
19+
gitlab.com/tozd/go/pcontrol v0.3.0/go.mod h1:lCf+6Ex3gnDYNFowNSWNiHUYJewCpBLe4Rot9je03Fk=
1620
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
1721
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1822
golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
1923
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2024
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2125
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
26+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2227
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
2328
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)