Fix build of prometheus-ovn-exporter

keuko · keuko · commit 44acae389431 · 2024-08-07T16:43:07.000+02:00
This patch fixed build of prometheus-ovn-exporter
when building with --image-name-prefix option.

Closes-Bug: #2076249
Change-Id: I5ba67d6e4bbe1b6d6caa842715b56720a027dc76
diff --git a/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
diff --git a/releasenotes/notes/bug-2076249-96b7f39fbdcf2293.yaml b/releasenotes/notes/bug-2076249-96b7f39fbdcf2293.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where prometheus-ovn-exporter will fail to build
+    if build was triggered with --image-name-prefix option.
+    `LP#2076249 <https://launchpad.net/bugs/2076249>`__

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}`
	`1`	`+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}`
`2`	`2`	`{% block labels %}`
`3`	`3`	`LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"`
`4`	`4`	`{% endblock %}`