@@ -103,12 +103,6 @@ $(PYTOOLS)/%: $(PYTOOLS)
103
103
CODESPELL = $(PYTOOLS ) /codespell
104
104
$(CODESPELL ) : PACKAGE=codespell
105
105
106
- # Definitions for semconvgen
107
- DOCKER_USER =$(shell id -u) :$(shell id -g)
108
- # TODO - Pull docker image versions from rennovate-friendly source, e.g.
109
- # $(shell cat dependencies.Dockerfile | awk '$$4=="weaver" {print $$2}')
110
- WEAVER_CONTAINER =otel/weaver:v0.12.0
111
-
112
106
# Generate
113
107
114
108
.PHONY : generate
@@ -275,6 +269,9 @@ check-clean-work-tree:
275
269
exit 1; \
276
270
fi
277
271
272
+ # The weaver docker image to use for semconv-generate.
273
+ WEAVER_IMAGE := $(shell awk '$$4=="weaver" {print $$2}' $(DEPENDENCIES_DOCKERFILE ) )
274
+
278
275
SEMCONVPKG ?= "semconv/"
279
276
.PHONY : semconv-generate
280
277
semconv-generate : $(SEMCONVKIT )
@@ -292,7 +289,7 @@ semconv-generate: $(SEMCONVKIT)
292
289
--mount ' type=bind,source=$(PWD)/semconv,target=/home/weaver/templates/registry/go,readonly' \
293
290
--mount ' type=bind,source=$(PWD)/semconv/${TAG},target=/home/weaver/target' \
294
291
--mount ' type=bind,source=$(HOME)/.weaver,target=/tmp/weaver/.weaver' \
295
- $(WEAVER_CONTAINER ) registry generate \
292
+ $(WEAVER_IMAGE ) registry generate \
296
293
--registry=/source/model \
297
294
--templates=/home/weaver/templates \
298
295
--param tag=$(TAG ) \
0 commit comments