Skip to content

Commit ad6dda9

Browse files
committed
Use dependencies.Dockerfile for weaver image
1 parent cecdca0 commit ad6dda9

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Makefile

+4-7
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ $(PYTOOLS)/%: $(PYTOOLS)
103103
CODESPELL = $(PYTOOLS)/codespell
104104
$(CODESPELL): PACKAGE=codespell
105105

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-
112106
# Generate
113107

114108
.PHONY: generate
@@ -275,6 +269,9 @@ check-clean-work-tree:
275269
exit 1; \
276270
fi
277271

272+
# The weaver docker image to use for semconv-generate.
273+
WEAVER_IMAGE := $(shell awk '$$4=="weaver" {print $$2}' $(DEPENDENCIES_DOCKERFILE))
274+
278275
SEMCONVPKG ?= "semconv/"
279276
.PHONY: semconv-generate
280277
semconv-generate: $(SEMCONVKIT)
@@ -292,7 +289,7 @@ semconv-generate: $(SEMCONVKIT)
292289
--mount 'type=bind,source=$(PWD)/semconv,target=/home/weaver/templates/registry/go,readonly' \
293290
--mount 'type=bind,source=$(PWD)/semconv/${TAG},target=/home/weaver/target' \
294291
--mount 'type=bind,source=$(HOME)/.weaver,target=/tmp/weaver/.weaver' \
295-
$(WEAVER_CONTAINER) registry generate \
292+
$(WEAVER_IMAGE) registry generate \
296293
--registry=/source/model \
297294
--templates=/home/weaver/templates \
298295
--param tag=$(TAG) \

dependencies.Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# This is a renovate-friendly source of Docker images.
22
FROM python:3.13.1-slim-bullseye AS python
3+
FROM otel/weaver:v0.12.0 AS weaver

0 commit comments

Comments
 (0)