From 85f5c2f48a944793ac4299a2324aff6c1cfa3129 Mon Sep 17 00:00:00 2001 From: Joshua Goldstein Date: Fri, 17 Feb 2023 17:24:38 -0600 Subject: [PATCH 1/5] update badger dep --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a0326e6b84b..d964488651f 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/Shopify/sarama v1.27.2 github.com/blevesearch/bleve v1.0.13 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd - github.com/dgraph-io/badger/v3 v3.0.0-20210924144023-7677fcb1e0c2 + github.com/dgraph-io/badger/v3 v3.0.0-20211108050342-6ed45ae41e5a github.com/dgraph-io/dgo/v210 v210.0.0-20210407152819-261d1c2a6987 github.com/dgraph-io/gqlgen v0.13.2 github.com/dgraph-io/gqlparser/v2 v2.2.1 diff --git a/go.sum b/go.sum index 0fdae41e93e..b12dbd91821 100644 --- a/go.sum +++ b/go.sum @@ -118,6 +118,8 @@ github.com/dgraph-io/badger v1.6.0 h1:DshxFxZWXUcO0xX476VJC07Xsr6ZCBVRHKZ93Oh7Ev github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/badger/v3 v3.0.0-20210924144023-7677fcb1e0c2 h1:xVtqMIdhJV6Tu2LrymuqRVgzFMTen+cCfs4A3AunmMc= github.com/dgraph-io/badger/v3 v3.0.0-20210924144023-7677fcb1e0c2/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M= +github.com/dgraph-io/badger/v3 v3.0.0-20211108050342-6ed45ae41e5a h1:O3ZghoxBczESRVgHy/UU0sy0fgSFW0QfBSYtfnTuw+Y= +github.com/dgraph-io/badger/v3 v3.0.0-20211108050342-6ed45ae41e5a/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M= github.com/dgraph-io/dgo/v210 v210.0.0-20210407152819-261d1c2a6987 h1:5aN6H88a2q3HkO8vSZxDlgjEpJf4Fz8rfy+/Wzx2uAc= github.com/dgraph-io/dgo/v210 v210.0.0-20210407152819-261d1c2a6987/go.mod h1:dCzdThGGTPYOAuNtrM6BiXj/86voHn7ZzkPL6noXR3s= github.com/dgraph-io/gqlgen v0.13.2 h1:TNhndk+eHKj5qE7BenKKSYdSIdOGhLqxR1rCiMso9KM= From f5f9c0282fe28383e8b72f6b7f69596f3dbeae45 Mon Sep 17 00:00:00 2001 From: Joshua Goldstein Date: Fri, 17 Feb 2023 18:05:44 -0600 Subject: [PATCH 2/5] update dockerfile in test --- graphql/e2e/custom_logic/cmd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql/e2e/custom_logic/cmd/Dockerfile b/graphql/e2e/custom_logic/cmd/Dockerfile index ab18821b809..1b31a5aa3af 100644 --- a/graphql/e2e/custom_logic/cmd/Dockerfile +++ b/graphql/e2e/custom_logic/cmd/Dockerfile @@ -1,5 +1,5 @@ -FROM golang:1.14.2-alpine3.11 +FROM golang:1.19-alpine3.17 COPY . . From bafb94d4569a388d2e6eb8bb66705dc2d2817a3e Mon Sep 17 00:00:00 2001 From: Joshua Goldstein Date: Fri, 17 Feb 2023 18:35:16 -0600 Subject: [PATCH 3/5] use go install --- graphql/e2e/custom_logic/cmd/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphql/e2e/custom_logic/cmd/Dockerfile b/graphql/e2e/custom_logic/cmd/Dockerfile index 1b31a5aa3af..be8fc4f5d4a 100644 --- a/graphql/e2e/custom_logic/cmd/Dockerfile +++ b/graphql/e2e/custom_logic/cmd/Dockerfile @@ -5,9 +5,9 @@ COPY . . RUN apk update && apk add git && apk add nodejs && apk add npm -RUN go get gopkg.in/yaml.v2 +RUN go install gopkg.in/yaml.v2@latest -RUN go get github.com/graph-gophers/graphql-go +RUN go install github.com/graph-gophers/graphql-go@latest RUN npm install From 35828184583e17709f612a1e5dc8b2cced9a4f7f Mon Sep 17 00:00:00 2001 From: Joshua Goldstein Date: Fri, 17 Feb 2023 20:48:12 -0600 Subject: [PATCH 4/5] add gomod var --- graphql/e2e/custom_logic/cmd/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/graphql/e2e/custom_logic/cmd/Dockerfile b/graphql/e2e/custom_logic/cmd/Dockerfile index be8fc4f5d4a..2ff6778d93b 100644 --- a/graphql/e2e/custom_logic/cmd/Dockerfile +++ b/graphql/e2e/custom_logic/cmd/Dockerfile @@ -5,9 +5,12 @@ COPY . . RUN apk update && apk add git && apk add nodejs && apk add npm -RUN go install gopkg.in/yaml.v2@latest +# As of Go 1.16 modules are on by default +RUN go env -w GO111MODULE=auto -RUN go install github.com/graph-gophers/graphql-go@latest +RUN go get gopkg.in/yaml.v2 + +RUN go get github.com/graph-gophers/graphql-go RUN npm install From ec125561047afeed7b1afaea69fa915ee13d1ce8 Mon Sep 17 00:00:00 2001 From: Joshua Goldstein Date: Fri, 17 Feb 2023 20:53:21 -0600 Subject: [PATCH 5/5] add comment --- graphql/e2e/custom_logic/cmd/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/graphql/e2e/custom_logic/cmd/Dockerfile b/graphql/e2e/custom_logic/cmd/Dockerfile index 2ff6778d93b..600fbca6ae0 100644 --- a/graphql/e2e/custom_logic/cmd/Dockerfile +++ b/graphql/e2e/custom_logic/cmd/Dockerfile @@ -5,7 +5,8 @@ COPY . . RUN apk update && apk add git && apk add nodejs && apk add npm -# As of Go 1.16 modules are on by default +# As of Go 1.16 modules are always on by default +# See https://go.dev/blog/go116-module-changes RUN go env -w GO111MODULE=auto RUN go get gopkg.in/yaml.v2