Merge "Switch to binary release of OpenStack Network exporter"

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() }}