resolve merge conflict

Signed-off-by: Sibasish Behera <[email protected]>
kubearmor · Jun 27, 2023 · 6bd058c · 6bd058c
2 parents 25caa33 + ed4549f
commit 6bd058c
Show file tree

Hide file tree

Showing 4 changed files with 1,212 additions and 28 deletions.
diff --git a/.github/workflows/ci-push-img.yml b/.github/workflows/ci-push-img.yml
@@ -8,7 +8,7 @@ jobs:
   push-docker-img:
     name: Create and push docker image
     if: github.repository == 'kubearmor/kubearmor-relay-server'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
       - name: Checkout code

diff --git a/relay-server/Dockerfile b/relay-server/Dockerfile
@@ -1,6 +1,6 @@
 ### Builder
 
-FROM golang:1.18-alpine as builder
+FROM golang:1.20-alpine3.17 as builder
 
 RUN apk update
 RUN apk add --no-cache make

diff --git a/relay-server/go.mod b/relay-server/go.mod
@@ -13,10 +13,13 @@ require (
 	github.com/cenkalti/backoff/v4 v4.2.1
 	github.com/dustin/go-humanize v1.0.1
 	github.com/elastic/go-elasticsearch/v7 v7.17.7
-	github.com/google/uuid v1.1.2
-	github.com/kubearmor/KubeArmor/protobuf v0.0.0-20221117040949-d3559c7ffd74
+	github.com/google/uuid v1.3.0
+	github.com/kubearmor/KubeArmor/protobuf v0.0.0-20230426155201-4a0d0af2a5d6
 	go.uber.org/zap v1.19.0
-	google.golang.org/grpc v1.49.0
+	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.55.0
 	k8s.io/apimachinery v0.21.1
 	k8s.io/client-go v0.21.1
 )