diff options
| author | Zuul <zuul@review.opendev.org> | 2025-04-24 08:36:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-04-24 08:36:06 +0000 |
| commit | e9d31761441177ac3782182c1af0ea82f65d0f7c (patch) | |
| tree | 9815d5b43b55ff5b1575b546768043245a7c772b /docker | |
| parent | 4203f2531de6bc13c2f43baa98b96997f6ba636d (diff) | |
| parent | ac79bc9b67823eab6d6e9a027a65261096cfcc19 (diff) | |
| download | kolla-e9d31761441177ac3782182c1af0ea82f65d0f7c.tar.gz kolla-e9d31761441177ac3782182c1af0ea82f65d0f7c.zip | |
Merge "Upgrade Prometheus to v3"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/prometheus/prometheus-server/Dockerfile.j2 (renamed from docker/prometheus/prometheus-v2-server/Dockerfile.j2) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/prometheus/prometheus-v2-server/Dockerfile.j2 b/docker/prometheus/prometheus-server/Dockerfile.j2 index e9f47f5c1..bcbc3021b 100644 --- a/docker/prometheus/prometheus-v2-server/Dockerfile.j2 +++ b/docker/prometheus/prometheus-server/Dockerfile.j2 @@ -3,12 +3,12 @@ FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} -{% block prometheus_v2_server_header %}{% endblock %} +{% block prometheus_server_header %}{% endblock %} {% import "macros.j2" as macros with context %} -{% block prometheus_v2_server_install %} -ADD prometheus-v2-server-archive /prometheus-server-source +{% block prometheus_server_install %} +ADD prometheus-server-archive /prometheus-server-source RUN ln -s /prometheus-server-source/* prometheus-server \ && mkdir -p /opt/prometheus \ @@ -18,7 +18,7 @@ RUN ln -s /prometheus-server-source/* prometheus-server \ {{ macros.kolla_patch_sources() }} -{% block prometheus_v2_server_footer %}{% endblock %} +{% block prometheus_server_footer %}{% endblock %} {% block footer %}{% endblock %} USER prometheus |