fix: resolve panic caused by new prometheus library

ory · Oct 25, 2021 · ff0a43e · ff0a43e
1 parent 7c7dc40
commit ff0a43e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -45,7 +45,7 @@ require (
 	github.com/ory/go-acc v0.2.6
 	github.com/ory/graceful v0.1.1
 	github.com/ory/herodot v0.9.12
-	github.com/ory/x v0.0.301
+	github.com/ory/x v0.0.302
 	github.com/pborman/uuid v1.2.1
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
@@ -1375,8 +1375,8 @@ github.com/ory/x v0.0.214/go.mod h1:aRl57gzyD4GF0HQCekovXhv0xTZgAgiht3o8eVhsm9Q=
 github.com/ory/x v0.0.250/go.mod h1:jUJaVptu+geeqlb9SyQCogTKj5ztSDIF6APkhbKtwLc=
 github.com/ory/x v0.0.272/go.mod h1:1TTPgJGQutrhI2OnwdrTIHE9ITSf4MpzXFzA/ncTGRc=
 github.com/ory/x v0.0.288/go.mod h1:APpShLyJcVzKw1kTgrHI+j/L9YM+8BRjHlcYObc7C1U=
-github.com/ory/x v0.0.301 h1:E/RCJwjRQtNYDVh3VlJX80hwybwbaU8XXorFktLqS2g=
-github.com/ory/x v0.0.301/go.mod h1:CDs8F4TtG/A+F9FfBR40G7u/gA3Rg1+NcvkLlxN+H+Q=
+github.com/ory/x v0.0.302 h1:S8WnDcplN/fGsJYu9A0Zib3R3gPZWdIYEN9/Fkx6bUc=
+github.com/ory/x v0.0.302/go.mod h1:CDs8F4TtG/A+F9FfBR40G7u/gA3Rg1+NcvkLlxN+H+Q=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

diff --git a/test/conformance/hydra/Dockerfile b/test/conformance/hydra/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16-buster AS builder
+FROM golang:1.17-buster AS builder
 
 RUN apt-get update && \
   apt-get install -y git gcc bash ssl-cert ca-certificates