Skip to content

Commit 53a4db3

Browse files
committed
chore: eradicate all CVEs
1 parent 4cb1ec9 commit 53a4db3

8 files changed

Lines changed: 345 additions & 120 deletions

File tree

.docker/Dockerfile-build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23-alpine3.20 AS builder
1+
FROM golang:1.24-alpine3.22 AS builder
22

33
RUN apk -U --no-cache add build-base git gcc bash
44

@@ -7,16 +7,16 @@ WORKDIR /go/src/github.com/ory/cli
77
ADD ./go.mod go.mod
88
ADD ./go.sum go.sum
99

10-
ENV GO111MODULE on
11-
ENV CGO_ENABLED 1
10+
ENV GO111MODULE=on
11+
ENV CGO_ENABLED=1
1212

1313
RUN go mod download
1414

1515
ADD . .
1616

1717
RUN CGO_CFLAGS="-D_LARGEFILE64_SOURCE" go build -tags sqlite,json1 -o /usr/bin/ory
1818

19-
FROM alpine:3.20
19+
FROM alpine:3.22
2020

2121
RUN apk add -U --no-cache ca-certificates bash
2222
RUN apk upgrade --no-cache libssl3 libcrypto3

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: ory/ci/checkout@master
1717
- uses: actions/setup-go@v5
1818
with:
19-
go-version: "1.23"
19+
go-version: "1.24"
2020
- uses: actions/cache@v4
2121
with:
2222
path: |

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v3
1212
- uses: actions/setup-go@v3
1313
with:
14-
go-version: "1.23"
14+
go-version: "1.24"
1515
- run: make format
1616
- name: Indicate formatting issues
1717
run: git diff HEAD --exit-code --color

.github/workflows/test-e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: "1.23"
17+
go-version: "1.24"
1818
- uses: actions/setup-node@v2
1919
with:
2020
node-version: "16"
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/checkout@v2
5454
- uses: actions/setup-go@v2
5555
with:
56-
go-version: "1.23"
56+
go-version: "1.24"
5757
- uses: actions/setup-node@v2
5858
with:
5959
node-version: "16"

go.mod

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/ory/cli
22

3-
go 1.23
3+
go 1.24
44

5-
toolchain go1.23.2
5+
toolchain go1.24.0
66

77
replace (
88
github.com/gorilla/sessions => github.com/ory/sessions v1.2.2-0.20220110165800-b09c17334dc2
@@ -16,9 +16,9 @@ require (
1616
github.com/Masterminds/semver/v3 v3.3.0
1717
github.com/deckarep/golang-set v1.8.0
1818
github.com/evanphx/json-patch v5.9.0+incompatible
19-
github.com/getkin/kin-openapi v0.128.0
19+
github.com/getkin/kin-openapi v0.131.0
2020
github.com/ghodss/yaml v1.0.0
21-
github.com/go-jose/go-jose/v3 v3.0.3
21+
github.com/go-jose/go-jose/v3 v3.0.4
2222
github.com/gofrs/uuid v4.4.0+incompatible
2323
github.com/gofrs/uuid/v3 v3.1.2
2424
github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6
@@ -40,12 +40,12 @@ require (
4040
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
4141
github.com/spf13/cobra v1.8.1
4242
github.com/spf13/pflag v1.0.5
43-
github.com/stretchr/testify v1.9.0
43+
github.com/stretchr/testify v1.10.0
4444
github.com/tidwall/gjson v1.18.0
4545
github.com/tidwall/sjson v1.2.5
4646
github.com/urfave/negroni v1.0.0
47-
golang.org/x/oauth2 v0.24.0
48-
golang.org/x/text v0.20.0
47+
golang.org/x/oauth2 v0.27.0
48+
golang.org/x/text v0.23.0
4949
gopkg.in/yaml.v2 v2.4.0
5050
)
5151

@@ -74,7 +74,7 @@ require (
7474
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
7575
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7676
github.com/cespare/xxhash/v2 v2.3.0 // indirect
77-
github.com/cloudflare/circl v1.3.7 // indirect
77+
github.com/cloudflare/circl v1.6.1 // indirect
7878
github.com/cockroachdb/cockroach-go/v2 v2.3.5 // indirect
7979
github.com/containerd/continuity v0.4.3 // indirect
8080
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
@@ -101,7 +101,7 @@ require (
101101
github.com/go-crypt/crypt v0.2.25 // indirect
102102
github.com/go-crypt/x v0.2.18 // indirect
103103
github.com/go-faker/faker/v4 v4.4.2 // indirect
104-
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
104+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
105105
github.com/go-logr/logr v1.4.2 // indirect
106106
github.com/go-logr/stdr v1.2.2 // indirect
107107
github.com/go-openapi/errors v0.22.0 // indirect
@@ -113,7 +113,7 @@ require (
113113
github.com/go-playground/validator/v10 v10.22.0 // indirect
114114
github.com/go-sql-driver/mysql v1.8.1 // indirect
115115
github.com/go-stack/stack v1.8.1 // indirect
116-
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
116+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
117117
github.com/go-webauthn/webauthn v0.11.0 // indirect
118118
github.com/go-webauthn/x v0.1.12 // indirect
119119
github.com/gobuffalo/envy v1.10.2 // indirect
@@ -131,8 +131,8 @@ require (
131131
github.com/goccy/go-yaml v1.11.3 // indirect
132132
github.com/gofrs/flock v0.8.1 // indirect
133133
github.com/gogo/protobuf v1.3.2 // indirect
134-
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
135-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
134+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
135+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
136136
github.com/golang/gddo v0.0.0-20190904175337-72a348e765d2 // indirect
137137
github.com/golang/mock v1.6.0 // indirect
138138
github.com/golang/protobuf v1.5.4 // indirect
@@ -158,7 +158,6 @@ require (
158158
github.com/imdario/mergo v0.3.16 // indirect
159159
github.com/inconshreveable/mousetrap v1.1.0 // indirect
160160
github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf // indirect
161-
github.com/invopop/yaml v0.3.1 // indirect
162161
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
163162
github.com/jackc/pgconn v1.14.3 // indirect
164163
github.com/jackc/pgio v1.0.0 // indirect
@@ -207,6 +206,8 @@ require (
207206
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
208207
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
209208
github.com/nyaruka/phonenumbers v1.3.6 // indirect
209+
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
210+
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
210211
github.com/oklog/ulid v1.3.1 // indirect
211212
github.com/oleiade/reflections v1.0.1 // indirect
212213
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -286,12 +287,12 @@ require (
286287
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
287288
go.uber.org/automaxprocs v1.5.3 // indirect
288289
go.uber.org/multierr v1.11.0 // indirect
289-
golang.org/x/crypto v0.28.0 // indirect
290+
golang.org/x/crypto v0.36.0 // indirect
290291
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
291292
golang.org/x/mod v0.19.0 // indirect
292-
golang.org/x/net v0.30.0 // indirect
293-
golang.org/x/sync v0.9.0 // indirect
294-
golang.org/x/sys v0.26.0 // indirect
293+
golang.org/x/net v0.38.0 // indirect
294+
golang.org/x/sync v0.12.0 // indirect
295+
golang.org/x/sys v0.31.0 // indirect
295296
golang.org/x/tools v0.23.0 // indirect
296297
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
297298
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect

0 commit comments

Comments
 (0)