@@ -26,13 +26,27 @@ CONTAINER_REPOSITORY=docker.io
26
26
# Per container overrides for the repository resolution.
27
27
WEAVER_CONTAINER_REPOSITORY =$(CONTAINER_REPOSITORY )
28
28
SEMCONVGEN_CONTAINER_REPOSITORY =$(CONTAINER_REPOSITORY )
29
+ OPA_CONTAINER_REPOSITORY =$(CONTAINER_REPOSITORY )
29
30
30
- # Fully qualified references to containers used in this Makefile.
31
+ # Versioned, non- qualified references to containers used in this Makefile.
31
32
# These are parsed from dependencies.Dockerfile so dependabot will autoupdate
32
33
# the versions of docker files we use.
33
- WEAVER_CONTAINER =$(shell cat dependencies.Dockerfile | awk '$$4=="weaver" {print $$2}')
34
- SEMCONVGEN_CONTAINER =$(shell cat dependencies.Dockerfile | awk '$$4=="semconvgen" {print $$2}')
35
- OPA_CONTAINER =$(shell cat dependencies.Dockerfile | awk '$$4=="opa" {print $$2}')
34
+ VERSIONED_WEAVER_CONTAINER_NO_REPO =$(shell cat dependencies.Dockerfile | awk '$$4=="weaver" {print $$2}')
35
+ VERSIONED_SEMCONVGEN_CONTAINER_NO_REPO =$(shell cat dependencies.Dockerfile | awk '$$4=="semconvgen" {print $$2}')
36
+ VERSIONED_OPA_CONTAINER_NO_REPO =$(shell cat dependencies.Dockerfile | awk '$$4=="opa" {print $$2}')
37
+
38
+ # Fully qualified references to containers used in this Makefile. These
39
+ # include the container repository, so that the build will work with tools
40
+ # like "podman" with a default "/etc/containers/registries.conf", where
41
+ # a default respository of "docker.io" is not assumed. This is intended to
42
+ # eliminate errors from podman such as:
43
+ #
44
+ # Error: short-name "otel/weaver:v1.2.3" did not resolve to an alias
45
+ # and no unqualified-search registries are defined in "/etc/containers/registries.conf"
46
+ WEAVER_CONTAINER =$(WEAVER_CONTAINER_REPOSITORY ) /$(VERSIONED_WEAVER_CONTAINER_NO_REPO )
47
+ SEMCONVGEN_CONTAINER =$(SEMCONVGEN_CONTAINER_REPOSITORY ) /$(VERSIONED_SEMCONVGEN_CONTAINER_NO_REPO )
48
+ OPA_CONTAINER =$(OPA_CONTAINER_REPOSITORY ) /$(VERSIONED_OPA_CONTAINER_NO_REPO )
49
+
36
50
37
51
DOCKER_USER =$(shell id -u) :$(shell id -g)
38
52
0 commit comments