diff options
| author | Doug Szumski <doug@stackhpc.com> | 2026-04-17 14:33:23 +0100 |
|---|---|---|
| committer | Doug Szumski <doug@stackhpc.com> | 2026-04-24 15:27:01 +0000 |
| commit | b6a69915755b0447cacda5686aacd5bfc9d6440b (patch) | |
| tree | 04d4e08492bf2a265cc8803b7f6d7b020ffa6033 /docker/prometheus | |
| parent | 4a7e5ee0dd0fe3ea31a3e6d59a51fe0ca72bda2c (diff) | |
| download | kolla-b6a69915755b0447cacda5686aacd5bfc9d6440b.tar.gz kolla-b6a69915755b0447cacda5686aacd5bfc9d6440b.zip | |
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 <doug@stackhpc.com>
Diffstat (limited to 'docker/prometheus')
| -rw-r--r-- | docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 | 37 |
1 files changed, 8 insertions, 29 deletions
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() }} |