Update hubble components

Signed-off-by: chez-shanpu <[email protected]>
cybozu · Sep 19, 2023 · 8cd5746 · 8cd5746
1 parent e366b5f
commit 8cd5746
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/hubble-relay/BRANCH b/hubble-relay/BRANCH
@@ -1 +1 @@
-1.12
+1.13
diff --git a/hubble-relay/Dockerfile b/hubble-relay/Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_IMAGE=scratch
-ARG GOLANG_IMAGE=quay.io/cybozu/golang:1.18-focal
-ARG UBUNTU_IMAGE=quay.io/cybozu/ubuntu:20.04
+ARG GOLANG_IMAGE=quay.io/cybozu/golang:1.20-jammy
+ARG UBUNTU_IMAGE=quay.io/cybozu/ubuntu:22.04
 
 # Stage1: build
 FROM ${GOLANG_IMAGE} as build

diff --git a/hubble-relay/TAG b/hubble-relay/TAG
@@ -1 +1 @@
-1.12.11.1
+1.13.6.0
diff --git a/hubble-ui/BRANCH b/hubble-ui/BRANCH
@@ -1 +1 @@
-0.10
+0.12
diff --git a/hubble-ui/Dockerfile b/hubble-ui/Dockerfile
@@ -1,10 +1,10 @@
-ARG GOLANG_IMAGE=quay.io/cybozu/golang:1.19-focal
-ARG UBUNTU_IMAGE=quay.io/cybozu/ubuntu:20.04
+ARG GOLANG_IMAGE=quay.io/cybozu/golang:1.20-jammy
+ARG UBUNTU_IMAGE=quay.io/cybozu/ubuntu:22.04
 ARG BACKEND_IMAGE=scratch
-ARG NGINX_VERSION=1.23.2
-ARG NJS_VERSION=0.7.7
-ARG PKG_RELEASE=1~focal
-ARG NGINX_UNPRIVILEGED_COMMIT_HASH=85f846c6c5d121b2b750d71c31429d9686523da0
+ARG NGINX_VERSON=1.25.2
+ARG NJS_VERSION=0.8.0
+ARG PKG_RELEASE=1~jammy
+ARG NGINX_UNPRIVILEGED_COMMIT_HASH=0ee942535b802636dd45b2d48b4e4f6d1a3eea89
 
 # Stage 1: build
 FROM ${GOLANG_IMAGE} AS builder-base

diff --git a/hubble-ui/TAG b/hubble-ui/TAG
@@ -1 +1 @@
-0.10.0.1
+0.12.0.0
diff --git a/hubble/BRANCH b/hubble/BRANCH
@@ -1 +1 @@
-0.11
+0.12
diff --git a/hubble/Dockerfile b/hubble/Dockerfile
@@ -1,7 +1,7 @@
 # hubble container
 
 # Stage1: build from source
-FROM quay.io/cybozu/golang:1.19-focal AS build
+FROM quay.io/cybozu/golang:1.20-jammy AS build
 
 COPY TAG /
 

diff --git a/hubble/TAG b/hubble/TAG
@@ -1 +1 @@
-0.11.3.1
+0.12.0.0