diff options
Diffstat (limited to 'docker')
14 files changed, 56 insertions, 160 deletions
diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 index 9fb067359..c75c861f0 100644 --- a/docker/etcd/Dockerfile.j2 +++ b/docker/etcd/Dockerfile.j2 @@ -9,16 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='etcd') }} -{% block etcd_repository_version %} -# NOTE(wszumski): It is suggested to upgrade one minor version at a time: -# https://github.com/etcd-io/website/blob/cf046546dec9e1dcea966dc21ea38027c3290e9a/content/en/docs/v3.4/upgrades/upgrade_3_4.md#upgrade-requirements -ARG etcd_version=v3.4.27 -ARG etcd_url=https://github.com/etcd-io/etcd/releases/download/${etcd_version}/etcd-${etcd_version}-linux-{{debian_arch}}.tar.gz -{% endblock %} +{% block etcd_install %} +ADD etcd-archive /etcd-source -RUN curl ${etcd_url} -o /tmp/etcd.tar.gz \ - && tar -C /usr/bin -xvz --strip-components=1 --wildcards '*/etcd' --wildcards '*/etcdctl' -f /tmp/etcd.tar.gz \ - && rm -f /tmp/etcd.tar.gz +RUN ln -s etcd-source/* etcd \ + && cp /etcd/etcd /etcd/etcdctl /usr/bin +{% endblock %} COPY etcd_sudoers /etc/sudoers.d/kolla_etcd_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2 b/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2 index 47e9a5308..4313c5e32 100755 --- a/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2 +++ b/docker/letsencrypt/letsencrypt-lego/Dockerfile.j2 @@ -24,21 +24,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {{ macros.install_packages(letsencrypt_lego_packages | customizable("packages")) }} -{% block letsencrypt_lego_repository_version %} -ARG letsencrypt_lego_version=4.6.0 -{% if debian_arch == 'arm64' %} -ARG letsencrypt_lego_sha256sum=f5cecda8880d04ffc394049852a797ec120aebf0203ab0f1b877a0cd89bb0b3e -{% else %} -ARG letsencrypt_lego_sha256sum=c0c408788cdec96a4697300211c3944a050bb3d62ed3525a5409c136c94e09cb -{% endif %} -ARG letsencrypt_lego_url=https://github.com/go-acme/lego/releases/download/v${letsencrypt_lego_version}/lego_v${letsencrypt_lego_version}_linux_{{debian_arch}}.tar.gz -{% endblock %} - {% block letsencrypt_lego_install %} -RUN curl -L -o /tmp/lego.tar.gz ${letsencrypt_lego_url} \ - && echo "${letsencrypt_lego_sha256sum} /tmp/lego.tar.gz" | sha256sum -c \ - && tar xvf /tmp/lego.tar.gz -C /opt/ \ - && rm -f /tmp/lego.tar.gz +ADD letsencrypt-lego-archive /lego-source + +RUN cp -r /lego-source/lego /opt/ {% endblock %} COPY letsencrypt-certificates.sh /usr/bin/letsencrypt-certificates diff --git a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 index d8c7d6113..babcac1d4 100644 --- a/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 +++ b/docker/prometheus/prometheus-alertmanager/Dockerfile.j2 @@ -5,18 +5,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_alertmanager_header %}{% endblock %} -{% block prometheus_alertmanager_repository_version %} -ARG prometheus_alertmanager_version=0.26.0 -ARG prometheus_alertmanager_archive=alertmanager-${prometheus_alertmanager_version}.linux-{{debian_arch}}.tar.gz -ARG prometheus_alertmanager_sha256sums_url=https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/sha256sums.txt -ARG prometheus_alertmanager_download_url=https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/${prometheus_alertmanager_archive} -{% endblock %} - {% block prometheus_alertmanager_install %} -RUN cd /tmp && curl -o ${prometheus_alertmanager_archive} ${prometheus_alertmanager_download_url} \ - && curl ${prometheus_alertmanager_sha256sums_url} -w '' | sha256sum --ignore-missing -c - \ - && tar xvf /tmp/${prometheus_alertmanager_archive} -C /opt/ \ - && rm -f /tmp/${prometheus_alertmanager_archive} \ +ADD prometheus-alertmanager-archive /prometheus-alertmanager-source +RUN cp -r /prometheus-alertmanager-source/* /opt/ \ && ln -s /opt/alertmanager* /opt/prometheus_alertmanager {% endblock %} diff --git a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 index d36d829b8..4b45bef8b 100644 --- a/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2 @@ -7,11 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% block prometheus_blackbox_exporter_repository_version %} -ARG blackbox_exporter_version=0.24.0 -ARG blackbox_exporter_url=https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz -{% endblock %} - {% if base_package_type == 'rpm' %} {% set blackbox_packages = [ 'libcap' @@ -25,10 +20,11 @@ ARG blackbox_exporter_url=https://github.com/prometheus/blackbox_exporter/releas {{ macros.install_packages(blackbox_packages | customizable("packages")) }} {% block prometheus_blackbox_exporter_install %} -RUN curl -o /tmp/blackbox_exporter.tar.gz ${blackbox_exporter_url} \ - && tar xvf /tmp/blackbox_exporter.tar.gz -C /opt/ \ - && rm -f /tmp/blackbox_exporter.tar.gz \ - && ln -s /opt/blackbox_exporter* /opt/blackbox_exporter \ +ADD prometheus-blackbox-exporter-archive /prometheus-blackbox-exporter-source + +RUN ln -s /prometheus-blackbox-exporter-source/* prometheus-blackbox-exporter \ + && mkdir -p /opt/blackbox_exporter/ \ + && cp /prometheus-blackbox-exporter/blackbox_exporter /opt/blackbox_exporter/ \ && setcap cap_net_raw+ep /opt/blackbox_exporter/blackbox_exporter {% endblock %} diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 index bbd2e1c05..f70de27f2 100644 --- a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 +++ b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 @@ -7,21 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% block prometheus_cadvisor_repository_version %} -ARG prometheus_cadvisor_version=0.47.2 -{% if debian_arch == 'arm64' %} -ARG prometheus_cadvisor_sha256sum=a15ebac9c60cccbb035e4af83cd45211edac19f3204ed0614b3336fddf91444b -{% else %} -ARG prometheus_cadvisor_sha256sum=30602f675e9bcd39b0d4cd4bd9e83c0849dd4bb3a60a0544b9f2a6451a3facfe -{% endif %} -ARG prometheus_cadvisor_url=https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor-v${prometheus_cadvisor_version}-linux-{{debian_arch}} -{% endblock %} - - {% block prometheus_cadvisor_install %} -RUN curl -o /tmp/cadvisor ${prometheus_cadvisor_url} \ - && echo "${prometheus_cadvisor_sha256sum} /tmp/cadvisor" | sha256sum -c \ - && mv /tmp/cadvisor /opt \ +ADD prometheus-cadvisor-archive /prometheus-cadvisor-source + +RUN cp /prometheus-cadvisor-source /opt/cadvisor \ && chmod 0755 /opt/cadvisor {% endblock %} diff --git a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 index f5f09493a..8721b5c23 100644 --- a/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2 @@ -5,16 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_elasticsearch_exporter_header %}{% endblock %} -{% block prometheus_elasticsearch_exporter_repository_version %} -ARG elasticsearch_exporter_version=1.6.0 -ARG elasticsearch_exporter_url=https://github.com/prometheus-community/elasticsearch_exporter/releases/download/v${elasticsearch_exporter_version}/elasticsearch_exporter-${elasticsearch_exporter_version}.linux-{{debian_arch}}.tar.gz -{% endblock %} - {% block prometheus_elasticsearch_exporter_install %} -RUN curl -o /tmp/elasticsearch_exporter.tar.gz ${elasticsearch_exporter_url} \ - && tar xvf /tmp/elasticsearch_exporter.tar.gz -C /opt/ \ - && rm -f /tmp/elasticsearch_exporter.tar.gz \ - && ln -s /opt/elasticsearch_exporter* /opt/elasticsearch_exporter +ADD prometheus-elasticsearch-exporter-archive /prometheus-elasticsearch-exporter-source + +RUN ln -s /prometheus-elasticsearch-exporter-source/* prometheus-elasticsearch-exporter \ + && mkdir -p /opt/elasticsearch_exporter \ + && cp /prometheus-elasticsearch-exporter/elasticsearch_exporter /opt/elasticsearch_exporter/ {% endblock %} {% block prometheus_elasticsearch_exporter_footer %}{% endblock %} diff --git a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 index 0f96dd81a..d288cce98 100644 --- a/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2 @@ -5,16 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_memcached_exporter_header %}{% endblock %} -{% block prometheus_memcached_exporter_repository_version %} -ARG memcached_exporter_version=0.13.0 -ARG memcached_exporter_url=https://github.com/prometheus/memcached_exporter/releases/download/v${memcached_exporter_version}/memcached_exporter-${memcached_exporter_version}.linux-{{debian_arch}}.tar.gz -{% endblock %} - {% block prometheus_memcached_exporter_install %} -RUN curl -o /tmp/memcached_exporter.tar.gz ${memcached_exporter_url} \ - && tar xvf /tmp/memcached_exporter.tar.gz -C /opt/ \ - && rm -f /tmp/memcached_exporter.tar.gz \ - && ln -s /opt/memcached_exporter* /opt/memcached_exporter +ADD prometheus-memcached-exporter-archive /prometheus-memcached-exporter-source + +RUN ln -s /prometheus-memcached-exporter-source/* prometheus-memcached-exporter \ + && mkdir -p /opt/memcached_exporter/ \ + && cp /prometheus-memcached-exporter/memcached_exporter /opt/memcached_exporter/ {% endblock %} {% block prometheus_memcached_exporter_footer %}{% endblock %} diff --git a/docker/prometheus/prometheus-msteams/Dockerfile.j2 b/docker/prometheus/prometheus-msteams/Dockerfile.j2 index 78e810bda..e05eb20b6 100644 --- a/docker/prometheus/prometheus-msteams/Dockerfile.j2 +++ b/docker/prometheus/prometheus-msteams/Dockerfile.j2 @@ -5,16 +5,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_msteams_header %}{% endblock %} -{% block prometheus_msteams_repository_version %} -ARG prometheus_msteams_version=1.5.2 -ARG prometheus_msteams_sha256sum=0f4df9ee31e655d1ec876ea2c53ab5ae5b07143ef21b9190e61b4d52839e135c -ARG prometheus_msteams_url=https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v${prometheus_msteams_version}/prometheus-msteams-linux-{{debian_arch}} -{% endblock %} - {% block prometheus_msteams_install %} -RUN curl -o /tmp/prometheus-msteams ${prometheus_msteams_url} \ - && echo "${prometheus_msteams_sha256sum} /tmp/prometheus-msteams" | sha256sum -c \ - && mv /tmp/prometheus-msteams /opt \ +ADD prometheus-msteams-archive /prometheus-msteams-source + +RUN cp /prometheus-msteams-source /opt/prometheus-msteams \ && chmod 0755 /opt/prometheus-msteams \ && mkdir -p /etc/msteams {% endblock %} diff --git a/docker/prometheus/prometheus-mtail/Dockerfile.j2 b/docker/prometheus/prometheus-mtail/Dockerfile.j2 index c7607ee27..6966ffed8 100644 --- a/docker/prometheus/prometheus-mtail/Dockerfile.j2 +++ b/docker/prometheus/prometheus-mtail/Dockerfile.j2 @@ -5,20 +5,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_mtail_header %}{% endblock %} -{% block prometheus_mtail_version %} - -ARG prometheus_mtail_version=3.0.0-rc52 -{% if debian_arch == 'amd64' %} -ARG prometheus_mtail_url=https://github.com/google/mtail/releases/download/v${prometheus_mtail_version}/mtail_${prometheus_mtail_version}_linux_amd64.tar.gz -{% else %} -ARG prometheus_mtail_url=https://github.com/google/mtail/releases/download/v${prometheus_mtail_version}/mtail_${prometheus_mtail_version}_linux_{{debian_arch}}.tar.gz -{% endif %} -{% endblock %} - {% block prometheus_mtail_install %} -RUN curl -o /tmp/mtail.tar.gz ${prometheus_mtail_url} \ - && tar xvf /tmp/mtail.tar.gz -C /opt/ \ - && rm -f /tmp/mtail.tar.gz +ADD prometheus-mtail-archive /prometheus-mtail-source + +RUN cp /prometheus-mtail-source/* /opt/ {% endblock %} {% block prometheus_mtail_footer %}{% endblock %} diff --git a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 index 1f1342bf2..c1054dc5e 100644 --- a/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2 @@ -5,16 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block mysqld_exporter_header %}{% endblock %} -{% block mysqld_exporter_repository_version %} -ARG mysqld_exporter_version=0.15.0 -ARG mysqld_exporter_url=https://github.com/prometheus/mysqld_exporter/releases/download/v${mysqld_exporter_version}/mysqld_exporter-${mysqld_exporter_version}.linux-{{debian_arch}}.tar.gz -{% endblock %} - {% block mysqld_exporter_install %} -RUN curl -o /tmp/mysqld_exporter.tar.gz ${mysqld_exporter_url} \ - && tar xvf /tmp/mysqld_exporter.tar.gz -C /opt/ \ - && rm -f /tmp/mysqld_exporter.tar.gz \ - && ln -s /opt/mysqld_exporter* /opt/mysqld_exporter +ADD prometheus-mysqld-exporter-archive /prometheus-mysqld-exporter-source + +RUN ln -s /prometheus-mysqld-exporter-source/* prometheus-mysqld-exporter \ + && mkdir -p /opt/mysqld_exporter \ + && cp /prometheus-mysqld-exporter/mysqld_exporter /opt/mysqld_exporter/ {% endblock %} {% block mysqld_exporter_footer %}{% endblock %} diff --git a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 index 1a639ff82..5e8cd361d 100644 --- a/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-node-exporter/Dockerfile.j2 @@ -5,22 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block node_exporter_header %}{% endblock %} -{% block node_exporter_repository_version %} -ARG node_exporter_version=1.7.0 -{% if debian_arch == 'arm64' %} -ARG node_exporter_sha256sum=e386c7b53bc130eaf5e74da28efc6b444857b77df8070537be52678aefd34d96 -{% else %} -ARG node_exporter_sha256sum=a550cd5c05f760b7934a2d0afad66d2e92e681482f5f57a917465b1fba3b02a6 -{% endif %} -ARG node_exporter_url=https://github.com/prometheus/node_exporter/releases/download/v{$node_exporter_version}/node_exporter-${node_exporter_version}.linux-{{debian_arch}}.tar.gz -{% endblock %} - {% block node_exporter_install %} -RUN curl -o /tmp/node_exporter.tar.gz ${node_exporter_url} \ - && echo "${node_exporter_sha256sum} /tmp/node_exporter.tar.gz" | sha256sum -c \ - && tar xvf /tmp/node_exporter.tar.gz -C /opt/ \ - && rm -f /tmp/node_exporter.tar.gz \ - && ln -s /opt/node_exporter* /opt/node_exporter +ADD prometheus-node-exporter-archive /prometheus-node-exporter-source + +RUN ln -s /prometheus-node-exporter-source/* prometheus-node-exporter \ + && mkdir -p /opt/node_exporter/ \ + && cp /prometheus-node-exporter/node_exporter /opt/node_exporter/ {% endblock %} {% block node_exporter_footer %}{% endblock %} diff --git a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 index e13957637..d5066973d 100644 --- a/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2 @@ -5,16 +5,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_openstack_exporter_header %}{% endblock %} -{% block prometheus_openstack_exporter_repository_version %} -ARG prometheus_openstack_exporter_version=1.6.0 -ARG prometheus_openstack_exporter_url=https://github.com/openstack-exporter/openstack-exporter/releases/download/v${prometheus_openstack_exporter_version}/openstack-exporter_${prometheus_openstack_exporter_version}_linux_{{debian_arch}}.tar.gz -{% endblock %} - {% block prometheus_openstack_exporter_install %} -RUN curl -o /tmp/prometheus_openstack_exporter.tar.gz ${prometheus_openstack_exporter_url} \ - && mkdir /opt/openstack-exporter \ - && tar xvf /tmp/prometheus_openstack_exporter.tar.gz -C /opt/openstack-exporter \ - && rm -f /tmp/prometheus_openstack_exporter.tar.gz +ADD prometheus-openstack-exporter-archive /prometheus-openstack-exporter-source + +RUN mkdir /opt/openstack-exporter \ + && cp /prometheus-openstack-exporter-source/openstack-exporter /opt/openstack-exporter/ {% endblock %} {% block prometheus_openstack_exporter_footer %}{% endblock %} diff --git a/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 index cca398372..6e7dca745 100644 --- a/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 +++ b/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 @@ -5,29 +5,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_ovn_exporter_header %}{% endblock %} -{% block prometheus_ovn_exporter_repository_version %} - -{% if base_arch == 'x86_64' %} -ARG ovn_arch=amd64 -{% elif base_arch == 'aarch64' %} -ARG ovn_arch=arm64 -{% endif %} - -ARG prometheus_ovn_version=1.0.7 -ARG prometheus_ovn_cksum_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/checksums.txt -ARG ovn_exporter_tgz=ovn-exporter_${prometheus_ovn_version}_linux_${ovn_arch}.tar.gz -ARG prometheus_ovn_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/${ovn_exporter_tgz} -{% endblock %} - {% block prometheus_ovn_exporter_install %} -RUN curl -Lo /tmp/${ovn_exporter_tgz} ${prometheus_ovn_url} \ - && curl -Lo /tmp/checksums.txt ${prometheus_ovn_cksum_url} \ - && cd /tmp \ - && sha256sum --ignore-missing -c /tmp/checksums.txt \ - && tar xvf /tmp/${ovn_exporter_tgz} -C /opt/ \ - && rm -f /tmp/${ovn_exporter_tgz} \ - && rm -f /tmp/checksums.txt +ADD prometheus-ovn-exporter-archive /prometheus-ovn-exporter-source + +RUN cp /prometheus-ovn-exporter-source/* /opt/ {% endblock %} {% block prometheus_ovn_exporter_footer %}{% endblock %} diff --git a/docker/prometheus/prometheus-v2-server/Dockerfile.j2 b/docker/prometheus/prometheus-v2-server/Dockerfile.j2 index 55ed69a1b..f77fb158f 100644 --- a/docker/prometheus/prometheus-v2-server/Dockerfile.j2 +++ b/docker/prometheus/prometheus-v2-server/Dockerfile.j2 @@ -5,16 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block prometheus_v2_server_header %}{% endblock %} -{% block prometheus_v2_server_repository_version %} -ARG prometheus_version=2.48.0 -ARG prometheus_url=https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz -{% endblock %} - {% block prometheus_v2_server_install %} -RUN curl -o /tmp/prometheus.tar.gz ${prometheus_url} \ - && tar xvf /tmp/prometheus.tar.gz -C /opt/ \ - && rm -f /tmp/prometheus.tar.gz \ - && ln -s /opt/prometheus* /opt/prometheus \ +ADD prometheus-v2-server-archive /prometheus-server-source + +RUN ln -s /prometheus-server-source/* prometheus-server \ + && mkdir -p /opt/prometheus \ + && cp -r /prometheus-server/* /opt/prometheus/ \ && mkdir -p /etc/prometheus /data {% endblock %} |