Merge branch 'develop' of github.com:ImageMonkey/imagemonkey-core int…

…o develop
ImageMonkey · Jan 29, 2024 · f46f6d2 · f46f6d2
2 parents 055de50 + 10dcb30
commit f46f6d2
Show file tree

Hide file tree

Showing 5 changed files with 1,782 additions and 121 deletions.
diff --git a/env/docker/Dockerfile.testing b/env/docker/Dockerfile.testing
@@ -1,7 +1,7 @@
-ARG DEBIAN_VERSION=buster
+ARG DEBIAN_VERSION=bullseye
 ARG POSTGRES_VERSION=14
 
-FROM golang:1.14.4-${DEBIAN_VERSION}
+FROM golang:1.21.6-${DEBIAN_VERSION}
 
 ARG DEBIAN_VERSION
 ARG POSTGRES_VERSION

diff --git a/src/go.mod b/src/go.mod
@@ -9,12 +9,10 @@ require (
 	github.com/bbernhard/gin-wraphh v0.0.0-20160304035037-ea8e4927b3a6
 	github.com/bbernhard/imghash v0.0.0-20151018235733-6afea89d4c0e
 	github.com/certifi/gocertifi v0.0.0-20190506164543-d2eda7129713 // indirect
-	github.com/golang-jwt/jwt v3.2.1+incompatible
-	github.com/garyburd/redigo v1.6.0
 	github.com/getsentry/raven-go v0.2.0
-	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/gin-gonic/gin v1.7.0
+	github.com/gin-gonic/gin v1.7.7
 	github.com/gofrs/uuid v3.2.0+incompatible
+	github.com/golang-jwt/jwt v3.2.1+incompatible
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-jsonnet v0.13.0
@@ -24,14 +22,13 @@ require (
 	github.com/jackc/pgtype v1.0.2
 	github.com/jackc/pgx/v4 v4.1.2
 	github.com/justinas/nosurf v0.0.0-20190416172904-05988550ea18 // indirect
+	github.com/lib/pq v1.2.0
 	github.com/oschwald/geoip2-golang v1.3.0
 	github.com/oschwald/maxminddb-golang v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.4.2
 	gocv.io/x/gocv v0.20.0
-	golang.org/dl v0.0.0-20190507014322-219d744c5398 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	gopkg.in/go-playground/validator.v8 v8.18.2 // indirect
 	gopkg.in/h2non/bimg.v1 v1.0.19
 	gopkg.in/resty.v1 v1.12.0
 	gopkg.in/src-d/go-git.v4 v4.12.0