Dima/orion_greptime_proto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Use a local Docker builder image for Rust protobuf generation (#320)

Browse Source 
* feat: dockerize rust protobuf generation in make and CI

Agent-Logs-Url: https://github.com/GreptimeTeam/greptime-proto/sessions/6438cfba-52ed-4c85-b8fe-1268cc55755a

Co-authored-by: WenyXu <32535939+WenyXu@users.noreply.github.com>

* fix: unify make all and CI generation with local builder image

Agent-Logs-Url: https://github.com/GreptimeTeam/greptime-proto/sessions/6438cfba-52ed-4c85-b8fe-1268cc55755a

Co-authored-by: WenyXu <32535939+WenyXu@users.noreply.github.com>

* fix: only use custom Docker image for rust target, go/java/cpp use protoc-all directly

Agent-Logs-Url: https://github.com/GreptimeTeam/greptime-proto/sessions/6e6885ee-2919-46f5-9dc5-301c3303888d

Co-authored-by: WenyXu <32535939+WenyXu@users.noreply.github.com>

* chore: fix README wording and add --user flag to rust docker run

Agent-Logs-Url: https://github.com/GreptimeTeam/greptime-proto/sessions/3983f532-e5e5-45e4-953d-27bc551ec13d

Co-authored-by: WenyXu <32535939+WenyXu@users.noreply.github.com>

* fix: make cargo/rustup dirs world-writable so --user flag works in container

Agent-Logs-Url: https://github.com/GreptimeTeam/greptime-proto/sessions/1bddab48-992c-481b-937f-6698dd9cc067

Co-authored-by: WenyXu <32535939+WenyXu@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: WenyXu <32535939+WenyXu@users.noreply.github.com>
This commit is contained in:
Copilot
2026-05-27 20:34:09 +08:00
committed by GitHub
parent 7224c2ad6d
commit 246a876568
6 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+15 -19
View File
@@ -1,29 +1,25 @@
.PHONY: all rust go go-deps java cpp check-protoc
.PHONY: all rust go go-deps java cpp build-builder-image
BUILDER_CONTAINER=namely/protoc-all:1.51_2
PROTOC_VERSION=3.21.12
PROTOC_CONTAINER=namely/protoc-all:1.51_2
BUILDER_CONTAINER=greptime/protoc-all-local:latest
BUILDER_DOCKERFILE=./docker/protoc-all/Dockerfile
BUILDER_CONTEXT=./docker/protoc-all
all: rust go java cpp
check-protoc:
@if ! command -v protoc >/dev/null 2>&1; then \
echo "Error: protoc is not installed. Please install protoc $(PROTOC_VERSION)."; \
exit 1; \
fi
@CURRENT_PROTOC_VERSION=$$(protoc --version | awk '{print $$2}'); \
if [ "$$CURRENT_PROTOC_VERSION" != "$(PROTOC_VERSION)" ]; then \
echo "Error: Required protoc version is $(PROTOC_VERSION), but found $$CURRENT_PROTOC_VERSION."; \
echo "Please install protoc $(PROTOC_VERSION) to ensure generated code is consistent."; \
exit 1; \
fi
build-builder-image:
docker build -f ${BUILDER_DOCKERFILE} -t ${BUILDER_CONTAINER} ${BUILDER_CONTEXT}
rust: check-protoc
cargo run --manifest-path xtask/Cargo.toml -- generate-rust
rust: build-builder-image
docker run --rm -t -w /greptime-proto \
--user $(shell id -u):$(shell id -g) \
--entrypoint ./scripts/generate-rust.sh \
-v ${PWD}:/greptime-proto ${BUILDER_CONTAINER}
go: go-deps
docker run --rm -t -w /greptime-proto \
--entrypoint ./scripts/generate-go.sh \
-v ${PWD}:/greptime-proto ${BUILDER_CONTAINER}
-v ${PWD}:/greptime-proto ${PROTOC_CONTAINER}
go-deps:
go mod download
@@ -31,9 +27,9 @@ go-deps:
java:
docker run --rm -t -w /greptime-proto \
--entrypoint ./scripts/generate-java.sh \
-v ${PWD}:/greptime-proto ${BUILDER_CONTAINER}
-v ${PWD}:/greptime-proto ${PROTOC_CONTAINER}
cpp:
docker run --rm -t -w /greptime-proto \
--entrypoint ./scripts/generate-cpp.sh \
-v ${PWD}:/greptime-proto ${BUILDER_CONTAINER}
-v ${PWD}:/greptime-proto ${PROTOC_CONTAINER}