From b6a69915755b0447cacda5686aacd5bfc9d6440b Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Fri, 17 Apr 2026 14:33:23 +0100 Subject: Switch to binary release of OpenStack Network exporter We no longer need to build this from source: aharivel has kindly responded to our request to create a release: https://github.com/openstack-k8s-operators/openstack-network-exporter/releases Needed-By: I35b3bb10aec18a9377515e8c04d2542e712c0f12 Change-Id: Id30cab4e4bbac470f33354870fd941c3ea17815c Signed-off-by: Doug Szumski --- .../Dockerfile.j2 | 37 +++++----------------- 1 file changed, 8 insertions(+), 29 deletions(-) (limited to 'docker/prometheus') diff --git a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 index 389f7c618..585b96423 100644 --- a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 @@ -1,39 +1,18 @@ -FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} AS build-stage - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - - {% set prometheus_openstack_network_exporter_build_packages = [ - 'golang', - 'make', - ] %} - -{% elif base_package_type == 'deb' %} - - {% set prometheus_openstack_network_exporter_build_packages = [ - 'golang', - 'make', - ] %} - -{% endif %} - -{{ macros.install_packages(prometheus_openstack_network_exporter_build_packages | customizable("packages")) }} - -ADD prometheus-openstack-network-exporter-archive / - -RUN cd openstack-network-exporter* && make - -FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} AS final-stage +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} {% block prometheus_openstack_network_exporter_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + {% block prometheus_openstack_network_exporter_install %} -RUN mkdir /opt/openstack-network-exporter -COPY --from=build-stage /openstack-network-exporter*/dataplane-node-exporter /opt/openstack-network-exporter/ +ADD prometheus-openstack-network-exporter-archive /prometheus-openstack-network-exporter-source + +RUN mkdir /opt/openstack-network-exporter \ + && cp /prometheus-openstack-network-exporter-source /opt/openstack-network-exporter/openstack-network-exporter \ + && chmod 0755 /opt/openstack-network-exporter/openstack-network-exporter {% endblock %} {{ macros.kolla_patch_sources() }} -- cgit v1.2.3