Allow using different container runtime (#6247)

rim99 · web-flow · commit eba4b19dfe13 · 2024-11-23T14:50:32.000Z
diff --git a/Makefile.Protobuf.mk b/Makefile.Protobuf.mk
@@ -14,9 +14,10 @@
 # instead of the go_package's declared by the imported protof files.
 #
 
+DOCKER=docker
 DOCKER_PROTOBUF_VERSION=0.5.0
 DOCKER_PROTOBUF=jaegertracing/protobuf:$(DOCKER_PROTOBUF_VERSION)
-PROTOC := docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD} ${DOCKER_PROTOBUF} --proto_path=${PWD}
+PROTOC := ${DOCKER} run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD} ${DOCKER_PROTOBUF} --proto_path=${PWD}
 
 PATCHED_OTEL_PROTO_DIR = proto-gen/.patched-otel-proto
 

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,10 @@`
`14`	`14`	`# instead of the go_package's declared by the imported protof files.`
`15`	`15`	`#`
`16`	`16`
	`17`	`+DOCKER=docker`
`17`	`18`	`DOCKER_PROTOBUF_VERSION=0.5.0`
`18`	`19`	`DOCKER_PROTOBUF=jaegertracing/protobuf:$(DOCKER_PROTOBUF_VERSION)`
`19`		`-PROTOC := docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD} ${DOCKER_PROTOBUF} --proto_path=${PWD}`
	`20`	`+PROTOC := ${DOCKER} run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD} ${DOCKER_PROTOBUF} --proto_path=${PWD}`
`20`	`21`
`21`	`22`	`PATCHED_OTEL_PROTO_DIR = proto-gen/.patched-otel-proto`
`22`	`23`