diff --git a/Dockerfile.cli b/Dockerfile.cli index 12a62bd..8c1916f 100644 --- a/Dockerfile.cli +++ b/Dockerfile.cli @@ -1,4 +1,4 @@ -FROM ghcr.io/cybozu/golang:1.22-jammy as builder +FROM ghcr.io/cybozu/golang:1.23-jammy as builder WORKDIR /work COPY go.mod go.mod COPY go.sum go.sum diff --git a/Dockerfile.daemon b/Dockerfile.daemon index 659e4fe..2ca9051 100644 --- a/Dockerfile.daemon +++ b/Dockerfile.daemon @@ -1,5 +1,5 @@ ARG FLATCAR_VERSION -FROM ghcr.io/cybozu/golang:1.22-jammy as builder +FROM ghcr.io/cybozu/golang:1.23-jammy as builder WORKDIR /work COPY go.mod go.mod @@ -18,8 +18,10 @@ ENV HOME=/home/necoperf COPY --from=flatcar /bin/ /bin/ COPY --from=flatcar /sbin/setcap /sbin/setcap COPY --from=flatcar /lib64 /lib64 +COPY --from=flatcar /usr/lib64 /usr/lib64 COPY --from=flatcar /usr/bin/perf /usr/bin/sleep /usr/bin/ + # install perf dependency COPY --from=flatcar /libs.tar /libs.tar RUN mkdir -p /usr/lib64 \ diff --git a/Makefile b/Makefile index 7a34c22..73ea7ca 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ BIN_DIR := $(shell pwd)/bin ENVTEST ?= $(BIN_DIR)/setup-envtest # Tool versions -MDBOOK_VERSION = 0.4.27 -PROTOC_VERSION = 24.2 -PROTOC_GEN_GO_VERSION = 1.31.0 -PROTOC_GEN_GO_GRPC_VERSION = 1.3.0 +MDBOOK_VERSION = 0.4.42 +PROTOC_VERSION = 28.3 +PROTOC_GEN_GO_VERSION = 1.35.2 +PROTOC_GEN_GO_GRPC_VERSION = 1.5.1 PROTOC_GEN_DOC_VERSION = 1.5.1 MDBOOK := $(BIN_DIR)/mdbook diff --git a/Makefile.versions b/Makefile.versions index b0c6f50..26047d1 100644 --- a/Makefile.versions +++ b/Makefile.versions @@ -1,5 +1,5 @@ E2ETEST_K8S_VERSION := 1.30.0 # ref to https://github.com/orgs/flatcar/packages/container/package/flatcar-sdk-amd64 -FLATCAR_VERSION := 3815.2.2 -KIND_VERSION := 0.23.0 -KUSTOMIZE_VERSION := 5.4.1 +FLATCAR_VERSION := 4081.0.0 +KIND_VERSION := 0.25.0 +KUSTOMIZE_VERSION := 5.5.0 diff --git a/go.mod b/go.mod index 5040d7e..b89ac3c 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/cybozu-go/necoperf -go 1.22.0 +go 1.23.0 -toolchain go1.22.6 +toolchain go1.23.3 require ( github.com/google/uuid v1.6.0