Merge branch 'master' of github.com:ImageMonkey/imagemonkey-core

ImageMonkey · Jan 29, 2024 · 2b4f834 · 2b4f834
2 parents 0920974 + 73e6504
commit 2b4f834
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 48 deletions.
diff --git a/env/docker/Dockerfile.blogsubscriptionworker b/env/docker/Dockerfile.blogsubscriptionworker
@@ -1,4 +1,4 @@
-FROM golang:1.14.4-buster
+FROM golang:1.21.6-bullseye
 
 ENV REDIS_ADDRESS=:6379
 ENV SENTRY_DSN=

diff --git a/env/docker/Dockerfile.bot b/env/docker/Dockerfile.bot
@@ -1,4 +1,4 @@
-FROM golang:1.14.4-buster
+FROM golang:1.21.6-bullseye
 
 RUN mkdir -p /home/go/bin
 ENV GOPATH=/home/go

diff --git a/env/docker/Dockerfile.buildbase b/env/docker/Dockerfile.buildbase
@@ -1,4 +1,4 @@
-FROM golang:1.14.4-buster
+FROM golang:1.21.6-bullseye
 
 ENV GOPATH=/home/go
 ENV GOBIN=/home/go/bin

diff --git a/env/docker/Dockerfile.buildbase2 b/env/docker/Dockerfile.buildbase2
@@ -13,6 +13,6 @@ RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | su
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 	postgresql-client-${POSTGRES_CLIENT_VERSION} \
-	# until this pull request (https://github.com/h2non/bimg/pull/266) is merged and https://github.com/h2non/bimg/issues/269 is resolved, use the fork
+	# until this pull request (https://github.com/h2non/bimg/pull/466) is merged, use this fork
 	&& curl -s https://raw.githubusercontent.com/bbernhard/bimg/master/preinstall.sh | bash - \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/env/docker/Dockerfile.dataprocessor b/env/docker/Dockerfile.dataprocessor
@@ -1,4 +1,4 @@
-FROM golang:1.14.4-buster
+FROM golang:1.21.6-bullseye
 
 ENV USE_SENTRY=true
 ARG SINGLESHOT=false

diff --git a/env/docker/Dockerfile.statworker b/env/docker/Dockerfile.statworker
@@ -1,4 +1,4 @@
-FROM golang:1.14.4-buster
+FROM golang:1.21.6-bullseye
 
 ENV SENTRY_DSN=
 ENV IMAGEMONKEY_DB_CONNECTION_STRING=

diff --git a/env/docker/Dockerfile.trendinglabelsworker b/env/docker/Dockerfile.trendinglabelsworker
@@ -1,4 +1,4 @@
-FROM golang:1.14.4-buster
+FROM golang:1.21.6-bullseye
 
 ENV USE_SENTRY=true
 ENV SINGLESHOT=false

diff --git a/src/go.mod b/src/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/bbernhard/imghash v0.0.0-20151018235733-6afea89d4c0e
 	github.com/certifi/gocertifi v0.0.0-20190506164543-d2eda7129713 // indirect
 	github.com/getsentry/raven-go v0.2.0
-	github.com/gin-gonic/gin v1.7.7
+	github.com/gin-gonic/gin v1.9.1
 	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
@@ -21,13 +21,13 @@ require (
 	github.com/jackc/pgconn v1.1.0
 	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/justinas/nosurf v1.1.1 // 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/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/crypto v0.17.0
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	gopkg.in/h2non/bimg.v1 v1.0.19
 	gopkg.in/resty.v1 v1.12.0

diff --git a/src/go.sum b/src/go.sum