build: fix dockerfile for frontend

Signed-off-by: Dmitry Kharitonov <dmitry@isovalent.com>
cilium · Apr 25, 2022 · 706f630 · 706f630
1 parent 2a80b5a
commit 706f630
Show file tree

Hide file tree

Showing 55 changed files with 3,705 additions and 5,699 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,9 +28,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: '^1.17'
+          go-version: '^1.18'
       - name: Check Go module vendoring
         working-directory: ./backend
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -30,6 +30,5 @@ COPY . .
 ARG NODE_ENV=production
 RUN npm run build
 
-FROM docker.io/nginxinc/nginx-unprivileged:1.21.4-alpine@sha256:9db074b3025019e92d259d3f61849ce9bc6e7214a4b48634d7a1aff02dfb8747
+FROM docker.io/nginxinc/nginx-unprivileged:1.21.6-alpine@sha256:c754b5ff17e6cd39e786855ee31d4eeac21276d26119bf37385cbb3dcc3a9d29
 COPY --from=stage1 /app/server/public /app
-COPY --from=stage1 /app/server/nginx-hubble-ui-frontend.conf /etc/nginx/conf.d/default.conf
diff --git a/backend/.golangci.yml b/backend/.golangci.yml
@@ -43,17 +43,17 @@ linters:
 
 linters-settings:
   gosimple:
-    go: "1.17"
+    go: "1.18"
   govet:
     enable-all: true
     disable:
       - fieldalignment
   staticcheck:
-    go: "1.17"
+    go: "1.18"
   stylecheck:
-    go: "1.17"
+    go: "1.18"
   unused:
-    go: "1.17"
+    go: "1.18"
 
 issues:
   exclude-rules:

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -3,7 +3,7 @@
 # Copyright 2021 Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG GOLANG_IMAGE=docker.io/library/golang:1.17.4-bullseye@sha256:dbc5c71a115118983b4bc3a253f9e05ff4854b6fda3adaf3c2eed3cd6e0e04cf
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.1-bullseye@sha256:7c4f3edb000e9e0e8b2a3e30d1d4969c1bdca2dff3ba51fb3d965628e5a307f8
 
 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
 # Represents the plataform where the build is happening, do not mix with

diff --git a/backend/build-gops.sh b/backend/build-gops.sh
@@ -8,7 +8,7 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-gops_version="v0.3.17"
+gops_version="v0.3.22"
 
 mkdir -p /go/src/github.com/google
 cd /go/src/github.com/google
@@ -26,4 +26,4 @@ for arch in amd64 arm64 ; do
 done
 
 x86_64-linux-gnu-strip /out/linux/amd64/bin/gops
-aarch64-linux-gnu-strip /out/linux/arm64/bin/gops
+aarch64-linux-gnu-strip /out/linux/arm64/bin/gops
diff --git a/backend/go.mod b/backend/go.mod
@@ -1,21 +1,21 @@
 module github.com/cilium/hubble-ui/backend
 
-go 1.17
+go 1.18
 
 require (
-	github.com/cilium/cilium v1.11.1
+	github.com/cilium/cilium v1.11.3
 	github.com/cilium/hubble v0.9.0
 	github.com/golang/protobuf v1.5.2
 	github.com/google/gops v0.3.22
 	github.com/improbable-eng/grpc-web v0.15.0
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
-	google.golang.org/grpc v1.44.0
+	google.golang.org/grpc v1.45.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
-	google.golang.org/protobuf v1.27.1
-	k8s.io/api v0.23.3
-	k8s.io/apimachinery v0.23.3
-	k8s.io/client-go v0.23.3
+	google.golang.org/protobuf v1.28.0
+	k8s.io/api v0.23.5
+	k8s.io/apimachinery v0.23.5
+	k8s.io/client-go v0.23.5
 )
 
 require (
@@ -55,7 +55,7 @@ require (
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20211207154714-918901c715cf // indirect
+	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

diff --git a/backend/go.sum b/backend/go.sum
diff --git a/backend/proto/ui/notifications.pb.go b/backend/proto/ui/notifications.pb.go
diff --git a/backend/proto/ui/status.pb.go b/backend/proto/ui/status.pb.go
diff --git a/backend/proto/ui/ui.pb.go b/backend/proto/ui/ui.pb.go
diff --git a/backend/vendor/github.com/cilium/cilium/AUTHORS b/backend/vendor/github.com/cilium/cilium/AUTHORS
diff --git a/backend/vendor/github.com/cilium/cilium/pkg/logging/logfields/logfields.go b/backend/vendor/github.com/cilium/cilium/pkg/logging/logfields/logfields.go
diff --git a/backend/vendor/google.golang.org/grpc/CONTRIBUTING.md b/backend/vendor/google.golang.org/grpc/CONTRIBUTING.md
diff --git a/backend/vendor/google.golang.org/grpc/clientconn.go b/backend/vendor/google.golang.org/grpc/clientconn.go
diff --git a/backend/vendor/google.golang.org/grpc/credentials/insecure/insecure.go b/backend/vendor/google.golang.org/grpc/credentials/insecure/insecure.go
diff --git a/backend/vendor/google.golang.org/grpc/interceptor.go b/backend/vendor/google.golang.org/grpc/interceptor.go
diff --git a/backend/vendor/google.golang.org/grpc/internal/channelz/funcs.go b/backend/vendor/google.golang.org/grpc/internal/channelz/funcs.go