From ab679adcbfaa251b2de00daa0acdbb7771a8ae04 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 9 Jan 2019 16:42:17 +0100 Subject: debian/ubuntu: introduce 'debian_arch' variable Many images have 'if x86_64 then amd64 elif aarch64 then arm64' check to comply with Debian like architecture names in several projects. This patch creates 'debian_arch' variable which can be used in all Docker files (similar to 'base_arch' one). All required images got converted to use it. Change-Id: I9c5e6f13d6c9b24fe323408512bd5aef290111ad --- docker/prometheus/prometheus-alertmanager/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-base/Dockerfile.j2 | 8 -------- docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-node-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 | 2 +- docker/prometheus/prometheus-server/Dockerfile.j2 | 2 +- 9 files changed, 8 insertions(+), 16 deletions(-) (limited to 'docker/prometheus') diff --git a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 index 341e0fe06..626b77837 100644 --- a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 +++ b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 @@ -8,7 +8,7 @@ ENV prometheus_alertmanager_version=0.14.0 {% endblock %} {% block prometheus_alertmanager_install %} -RUN curl -sSL -o /tmp/prometheus_alertmanager.tar.gz https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/alertmanager-${prometheus_alertmanager_version}.linux-${prometheus_arch}.tar.gz \ +RUN curl -sSL -o /tmp/prometheus_alertmanager.tar.gz https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/alertmanager-${prometheus_alertmanager_version}.linux-{{debian_arch}}.tar.gz \ && tar xvf /tmp/prometheus_alertmanager.tar.gz -C /opt/ \ && rm -f /tmp/prometheus_alertmanager.tar.gz \ && ln -s /opt/alertmanager* /opt/prometheus_alertmanager diff --git a/docker/prometheus/prometheus-base/Dockerfile.j2 b/docker/prometheus/prometheus-base/Dockerfile.j2 index 93da38239..8bb86e227 100644 --- a/docker/prometheus/prometheus-base/Dockerfile.j2 +++ b/docker/prometheus/prometheus-base/Dockerfile.j2 @@ -7,14 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='prometheus') }} -{% if base_arch == 'x86_64' %} -ENV prometheus_arch=amd64 -{% elif base_arch == 'aarch64' %} -ENV prometheus_arch=arm64 -{% else %} -ENV prometheus_arch={{ base_arch }} -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 index 66bc7666f..8ca586759 100644 --- a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 @@ -8,7 +8,7 @@ ENV blackbox_exporter_version=0.12.0 {% endblock %} {% block prometheus_blackbox_exporter_install %} -RUN curl -sSL -o /tmp/blackbox_exporter.tar.gz https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-${prometheus_arch}.tar.gz \ +RUN curl -sSL -o /tmp/blackbox_exporter.tar.gz https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz \ && tar xvf /tmp/blackbox_exporter.tar.gz -C /opt/ \ && rm -f /tmp/blackbox_exporter.tar.gz \ && ln -s /opt/blackbox_exporter* /opt/blackbox_exporter diff --git a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 index 621faa095..5dbdd8fc9 100644 --- a/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2 @@ -8,7 +8,7 @@ ENV haproxy_exporter_version=0.7.1 {% endblock %} {% block haproxy_exporter_install %} -RUN curl -sSL -o /tmp/haproxy_exporter.tar.gz https://github.com/prometheus/haproxy_exporter/releases/download/v${haproxy_exporter_version}/haproxy_exporter-${haproxy_exporter_version}.linux-${prometheus_arch}.tar.gz \ +RUN curl -sSL -o /tmp/haproxy_exporter.tar.gz https://github.com/prometheus/haproxy_exporter/releases/download/v${haproxy_exporter_version}/haproxy_exporter-${haproxy_exporter_version}.linux-{{debian_arch}}.tar.gz \ && tar xvf /tmp/haproxy_exporter.tar.gz -C /opt/ \ && rm -f /tmp/haproxy_exporter.tar.gz \ && ln -s /opt/haproxy_exporter* /opt/haproxy_exporter diff --git a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 index 65fe5d0b0..d3cc78d84 100644 --- a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 @@ -8,7 +8,7 @@ ENV memcached_exporter_version=0.4.1 {% endblock %} {% block prometheus_memcached_exporter_install %} -RUN curl -sSL -o /tmp/memcached_exporter.tar.gz https://github.com/prometheus/memcached_exporter/releases/download/v${memcached_exporter_version}/memcached_exporter-${memcached_exporter_version}.linux-${prometheus_arch}.tar.gz \ +RUN curl -sSL -o /tmp/memcached_exporter.tar.gz https://github.com/prometheus/memcached_exporter/releases/download/v${memcached_exporter_version}/memcached_exporter-${memcached_exporter_version}.linux-{{debian_arch}}.tar.gz \ && tar xvf /tmp/memcached_exporter.tar.gz -C /opt/ \ && rm -f /tmp/memcached_exporter.tar.gz \ && ln -s /opt/memcached_exporter* /opt/memcached_exporter diff --git a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 index e9f6773a2..d9bc7e775 100644 --- a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 @@ -8,7 +8,7 @@ ENV mysqld_exporter_version=0.10.0 {% endblock %} {% block mysqld_exporter_install %} -RUN curl -ssL -o /tmp/mysqld_exporter.tar.gz https://github.com/prometheus/mysqld_exporter/releases/download/v${mysqld_exporter_version}/mysqld_exporter-${mysqld_exporter_version}.linux-${prometheus_arch}.tar.gz \ +RUN curl -ssL -o /tmp/mysqld_exporter.tar.gz https://github.com/prometheus/mysqld_exporter/releases/download/v${mysqld_exporter_version}/mysqld_exporter-${mysqld_exporter_version}.linux-{{debian_arch}}.tar.gz \ && tar xvf /tmp/mysqld_exporter.tar.gz -C /opt/ \ && rm -f /tmp/mysqld_exporter.tar.gz \ && ln -s /opt/mysqld_exporter* /opt/mysqld_exporter diff --git a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 index 1738285ba..59f6b3223 100644 --- a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 @@ -8,7 +8,7 @@ ENV node_exporter_version=0.14.0 {% endblock %} {% block node_exporter_install %} -RUN curl -sSL -o /tmp/node_exporter.tar.gz https://github.com/prometheus/node_exporter/releases/download/v${node_exporter_version}/node_exporter-${node_exporter_version}.linux-${prometheus_arch}.tar.gz \ +RUN curl -sSL -o /tmp/node_exporter.tar.gz https://github.com/prometheus/node_exporter/releases/download/v${node_exporter_version}/node_exporter-${node_exporter_version}.linux-{{debian_arch}}.tar.gz \ && tar xvf /tmp/node_exporter.tar.gz -C /opt/ \ && rm -f /tmp/node_exporter.tar.gz \ && ln -s /opt/node_exporter* /opt/node_exporter diff --git a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 index 6b7ec1b69..f300fd807 100644 --- a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 @@ -8,7 +8,7 @@ ENV prometheus_openstack_exporter_version=0.0.5 {% endblock %} {% block prometheus_openstack_exporter_install %} -RUN curl -sSL -o /tmp/prometheus_openstack_exporter.tar.gz https://github.com/Linaro/openstack-exporter/releases/download/v${prometheus_openstack_exporter_version}/openstack-exporter-${prometheus_openstack_exporter_version}.linux-${prometheus_arch}.tar.gz \ +RUN curl -sSL -o /tmp/prometheus_openstack_exporter.tar.gz https://github.com/Linaro/openstack-exporter/releases/download/v${prometheus_openstack_exporter_version}/openstack-exporter-${prometheus_openstack_exporter_version}.linux-{{debian_arch}}.tar.gz \ && tar xvf /tmp/prometheus_openstack_exporter.tar.gz -C /opt/ \ && rm -f /tmp/prometheus_openstack_exporter.tar.gz \ && ln -s /opt/openstack-exporter* /opt/openstack-exporter diff --git a/docker/prometheus/prometheus-server/Dockerfile.j2 b/docker/prometheus/prometheus-server/Dockerfile.j2 index 686ac3b25..cf9d2bfef 100644 --- a/docker/prometheus/prometheus-server/Dockerfile.j2 +++ b/docker/prometheus/prometheus-server/Dockerfile.j2 @@ -8,7 +8,7 @@ ENV prometheus_version=1.7.1 {% endblock %} {% block prometheus_server_install %} -RUN curl -sSL -o /tmp/prometheus.tar.gz https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-${prometheus_arch}.tar.gz \ +RUN curl -sSL -o /tmp/prometheus.tar.gz https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz \ && tar xvf /tmp/prometheus.tar.gz -C /opt/ \ && rm -f /tmp/prometheus.tar.gz \ && ln -s /opt/prometheus* /opt/prometheus \ -- cgit v1.2.3