Skip to content

Commit

Permalink
Bump necoperf v0.1.3
Browse files Browse the repository at this point in the history
Update for review

Change Flatcar Linux version

revert flatcar version

update flatcar ver

Add lib

move shared lib

update lib

add /usr/lib64
  • Loading branch information
takara9 committed Nov 20, 2024
1 parent 7b57b4b commit c07aaa5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.cli
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.daemon
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Makefile.versions
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit c07aaa5

Please # to comment.