From 01ea202a37eb98be36a90bc8d4fc1a8d44414c49 Mon Sep 17 00:00:00 2001 From: Dmitry Kharitonov Date: Wed, 20 Dec 2023 17:24:53 +0400 Subject: [PATCH] wip: try to fix ci --- Dockerfile | 2 +- backend/Dockerfile | 4 ++-- backend/go.mod | 2 +- backend/proto/flow/flow_pb.d.ts | 6 +++--- backend/proto/observer/observer_grpc_web_pb.d.ts | 2 +- backend/proto/observer/observer_grpc_web_pb.js | 2 +- backend/proto/observer/observer_pb.d.ts | 12 ++++++------ backend/proto/ui/notifications_pb.d.ts | 2 +- backend/proto/ui/ui_grpc_web_pb.d.ts | 4 ++-- backend/proto/ui/ui_grpc_web_pb.js | 2 +- backend/proto/ui/ui_pb.d.ts | 8 ++++---- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index f89a37b7f..545b8e7e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit. # Represents the plataform where the build is happening, do not mix with # TARGETARCH -FROM --platform=${BUILDPLATFORM} docker.io/library/node:18-alpine3.18@sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d as stage1 +FROM --platform=${BUILDPLATFORM} docker.io/library/node:18-alpine3.18@sha256:4bdb3f3105718f0742bc8d64bb4e36e8f955ebbee295325e40ae80bc8ef78833 as stage1 RUN apk add bash WORKDIR /app diff --git a/backend/Dockerfile b/backend/Dockerfile index 5f30c93f5..7ceab4376 100644 --- 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.21-bullseye@sha256:31848c4f02b08469e159ea1ee664a3f29602418b13e7d67dfd4560d169e14d55 +ARG GOLANG_IMAGE=docker.io/library/golang:1.21-bullseye@sha256:cfb0768fb3e3845e95f46f7150630d6eb0930ec10aa9b8ceb16e6f8f581d2d57 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit. # Represents the plataform where the build is happening, do not mix with @@ -27,7 +27,7 @@ COPY ./build-gops.sh . RUN --mount=target=/root/.cache,type=cache --mount=target=/go/pkg/mod,type=cache \ ./build-gops.sh -FROM docker.io/library/node:18-alpine3.18@sha256:435dcad253bb5b7f347ebc69c8cc52de7c912eb7241098b920f2fc2d7843183d +FROM docker.io/library/node:18-alpine3.18@sha256:4bdb3f3105718f0742bc8d64bb4e36e8f955ebbee295325e40ae80bc8ef78833 # TARGETOS is an automatic platform ARG enabled by Docker BuildKit. ARG TARGETOS # TARGETARCH is an automatic platform ARG enabled by Docker BuildKit. diff --git a/backend/go.mod b/backend/go.mod index b8cd0aa1f..6238931c3 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,6 +1,6 @@ module github.com/cilium/hubble-ui/backend -go 1.21.4 +go 1.21.5 require ( github.com/cilium/cilium v1.15.0-pre.2 diff --git a/backend/proto/flow/flow_pb.d.ts b/backend/proto/flow/flow_pb.d.ts index 7a74ce987..283e495db 100644 --- a/backend/proto/flow/flow_pb.d.ts +++ b/backend/proto/flow/flow_pb.d.ts @@ -1,8 +1,8 @@ import * as jspb from 'google-protobuf' -import * as google_protobuf_any_pb from 'google-protobuf/google/protobuf/any_pb'; -import * as google_protobuf_wrappers_pb from 'google-protobuf/google/protobuf/wrappers_pb'; -import * as google_protobuf_timestamp_pb from 'google-protobuf/google/protobuf/timestamp_pb'; +import * as google_protobuf_any_pb from 'google-protobuf/google/protobuf/any_pb'; // proto import: "google/protobuf/any.proto" +import * as google_protobuf_wrappers_pb from 'google-protobuf/google/protobuf/wrappers_pb'; // proto import: "google/protobuf/wrappers.proto" +import * as google_protobuf_timestamp_pb from 'google-protobuf/google/protobuf/timestamp_pb'; // proto import: "google/protobuf/timestamp.proto" export class Flow extends jspb.Message { diff --git a/backend/proto/observer/observer_grpc_web_pb.d.ts b/backend/proto/observer/observer_grpc_web_pb.d.ts index 4672aeeea..bd90f841b 100644 --- a/backend/proto/observer/observer_grpc_web_pb.d.ts +++ b/backend/proto/observer/observer_grpc_web_pb.d.ts @@ -1,6 +1,6 @@ import * as grpcWeb from 'grpc-web'; -import * as observer_observer_pb from '../observer/observer_pb'; +import * as observer_observer_pb from '../observer/observer_pb'; // proto import: "observer/observer.proto" export class ObserverClient { diff --git a/backend/proto/observer/observer_grpc_web_pb.js b/backend/proto/observer/observer_grpc_web_pb.js index e74c64a7d..aa17a6b8a 100644 --- a/backend/proto/observer/observer_grpc_web_pb.js +++ b/backend/proto/observer/observer_grpc_web_pb.js @@ -6,7 +6,7 @@ // Code generated by protoc-gen-grpc-web. DO NOT EDIT. // versions: -// protoc-gen-grpc-web v1.4.2 +// protoc-gen-grpc-web v1.5.0 // protoc v3.11.4 // source: observer/observer.proto diff --git a/backend/proto/observer/observer_pb.d.ts b/backend/proto/observer/observer_pb.d.ts index 9765f2282..54ff557b7 100644 --- a/backend/proto/observer/observer_pb.d.ts +++ b/backend/proto/observer/observer_pb.d.ts @@ -1,11 +1,11 @@ import * as jspb from 'google-protobuf' -import * as google_protobuf_any_pb from 'google-protobuf/google/protobuf/any_pb'; -import * as google_protobuf_wrappers_pb from 'google-protobuf/google/protobuf/wrappers_pb'; -import * as google_protobuf_timestamp_pb from 'google-protobuf/google/protobuf/timestamp_pb'; -import * as google_protobuf_field_mask_pb from 'google-protobuf/google/protobuf/field_mask_pb'; -import * as flow_flow_pb from '../flow/flow_pb'; -import * as relay_relay_pb from '../relay/relay_pb'; +import * as google_protobuf_any_pb from 'google-protobuf/google/protobuf/any_pb'; // proto import: "google/protobuf/any.proto" +import * as google_protobuf_wrappers_pb from 'google-protobuf/google/protobuf/wrappers_pb'; // proto import: "google/protobuf/wrappers.proto" +import * as google_protobuf_timestamp_pb from 'google-protobuf/google/protobuf/timestamp_pb'; // proto import: "google/protobuf/timestamp.proto" +import * as google_protobuf_field_mask_pb from 'google-protobuf/google/protobuf/field_mask_pb'; // proto import: "google/protobuf/field_mask.proto" +import * as flow_flow_pb from '../flow/flow_pb'; // proto import: "flow/flow.proto" +import * as relay_relay_pb from '../relay/relay_pb'; // proto import: "relay/relay.proto" export class ServerStatusRequest extends jspb.Message { diff --git a/backend/proto/ui/notifications_pb.d.ts b/backend/proto/ui/notifications_pb.d.ts index 364f750ed..5e9cb070d 100644 --- a/backend/proto/ui/notifications_pb.d.ts +++ b/backend/proto/ui/notifications_pb.d.ts @@ -1,6 +1,6 @@ import * as jspb from 'google-protobuf' -import * as ui_status_pb from '../ui/status_pb'; +import * as ui_status_pb from '../ui/status_pb'; // proto import: "ui/status.proto" export class Notification extends jspb.Message { diff --git a/backend/proto/ui/ui_grpc_web_pb.d.ts b/backend/proto/ui/ui_grpc_web_pb.d.ts index fe4c9c6ae..6a08aa28a 100644 --- a/backend/proto/ui/ui_grpc_web_pb.d.ts +++ b/backend/proto/ui/ui_grpc_web_pb.d.ts @@ -1,7 +1,7 @@ import * as grpcWeb from 'grpc-web'; -import * as ui_ui_pb from '../ui/ui_pb'; -import * as ui_status_pb from '../ui/status_pb'; +import * as ui_ui_pb from '../ui/ui_pb'; // proto import: "ui/ui.proto" +import * as ui_status_pb from '../ui/status_pb'; // proto import: "ui/status.proto" export class UIClient { diff --git a/backend/proto/ui/ui_grpc_web_pb.js b/backend/proto/ui/ui_grpc_web_pb.js index 49696496d..edb02149e 100644 --- a/backend/proto/ui/ui_grpc_web_pb.js +++ b/backend/proto/ui/ui_grpc_web_pb.js @@ -6,7 +6,7 @@ // Code generated by protoc-gen-grpc-web. DO NOT EDIT. // versions: -// protoc-gen-grpc-web v1.4.2 +// protoc-gen-grpc-web v1.5.0 // protoc v3.11.4 // source: ui/ui.proto diff --git a/backend/proto/ui/ui_pb.d.ts b/backend/proto/ui/ui_pb.d.ts index eb760a47c..de3d91693 100644 --- a/backend/proto/ui/ui_pb.d.ts +++ b/backend/proto/ui/ui_pb.d.ts @@ -1,9 +1,9 @@ import * as jspb from 'google-protobuf' -import * as google_protobuf_timestamp_pb from 'google-protobuf/google/protobuf/timestamp_pb'; -import * as flow_flow_pb from '../flow/flow_pb'; -import * as ui_notifications_pb from '../ui/notifications_pb'; -import * as ui_status_pb from '../ui/status_pb'; +import * as google_protobuf_timestamp_pb from 'google-protobuf/google/protobuf/timestamp_pb'; // proto import: "google/protobuf/timestamp.proto" +import * as flow_flow_pb from '../flow/flow_pb'; // proto import: "flow/flow.proto" +import * as ui_notifications_pb from '../ui/notifications_pb'; // proto import: "ui/notifications.proto" +import * as ui_status_pb from '../ui/status_pb'; // proto import: "ui/status.proto" export class GetEventsRequest extends jspb.Message {