From d7a333e4abda1824183554fb567f6ca516f2544c Mon Sep 17 00:00:00 2001 From: "grafanarenovatebot[bot]" <146220760+grafanarenovatebot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 04:05:34 +0000 Subject: [PATCH 1/3] Update dependency tempo to v2.6.0 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9f53f97..ed9d833 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ ENV GRAFANA_VERSION="11.1.3" # renovate: datasource=github-releases depName=prometheus packageName=prometheus/prometheus ENV PROMETHEUS_VERSION=v2.54.1 # renovate: datasource=github-releases depName=tempo packageName=grafana/tempo -ENV TEMPO_VERSION="2.5.0" +ENV TEMPO_VERSION=v2.6.0 # renovate: datasource=github-releases depName=loki packageName=grafana/loki ENV LOKI_VERSION="3.1.0" # renovate: datasource=github-releases depName=opentelemetry-collector packageName=open-telemetry/opentelemetry-collector-releases From abdb3cb6d45be5ac81ece78dd9bbf674350cce28 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 13 Sep 2024 11:56:22 +0200 Subject: [PATCH 2/3] use substring --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ed9d833..710cfed 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,10 +32,10 @@ RUN bash -c 'curl -sOL https://github.com/prometheus/prometheus/releases/downloa mv prometheus-"${PROMETHEUS_VERSION:1}".linux-"${TARGETARCH}" prometheus && \ rm prometheus-"${PROMETHEUS_VERSION:1}".linux-"${TARGETARCH}".tar.gz' -RUN bash -c 'curl -sOL https://github.com/grafana/tempo/releases/download/v"$TEMPO_VERSION"/tempo_"${TEMPO_VERSION}"_linux_"${TARGETARCH}".tar.gz && \ +RUN bash -c 'curl -sOL https://github.com/grafana/tempo/releases/download/${TEMPO_VERSION}"/tempo_"${TEMPO_VERSION:1}"_linux_"${TARGETARCH}".tar.gz && \ mkdir tempo && \ - tar xfz tempo_"${TEMPO_VERSION}"_linux_"${TARGETARCH}".tar.gz -C tempo/ && \ - rm tempo_"${TEMPO_VERSION}"_linux_"${TARGETARCH}".tar.gz' + tar xfz tempo_"${TEMPO_VERSION:1}"_linux_"${TARGETARCH}".tar.gz -C tempo/ && \ + rm tempo_"${TEMPO_VERSION:1}"_linux_"${TARGETARCH}".tar.gz' RUN bash -c 'curl -sOL https://github.com/grafana/loki/releases/download/v"$LOKI_VERSION"/loki-linux-"${TARGETARCH}".zip && \ mkdir loki && \ From 60c8f516ae9d2d4f07f29cd6f25a9099312dd100 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 13 Sep 2024 12:02:38 +0200 Subject: [PATCH 3/3] use substring --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 710cfed..9b69df5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,7 +32,7 @@ RUN bash -c 'curl -sOL https://github.com/prometheus/prometheus/releases/downloa mv prometheus-"${PROMETHEUS_VERSION:1}".linux-"${TARGETARCH}" prometheus && \ rm prometheus-"${PROMETHEUS_VERSION:1}".linux-"${TARGETARCH}".tar.gz' -RUN bash -c 'curl -sOL https://github.com/grafana/tempo/releases/download/${TEMPO_VERSION}"/tempo_"${TEMPO_VERSION:1}"_linux_"${TARGETARCH}".tar.gz && \ +RUN bash -c 'curl -sOL https://github.com/grafana/tempo/releases/download/"${TEMPO_VERSION}"/tempo_"${TEMPO_VERSION:1}"_linux_"${TARGETARCH}".tar.gz && \ mkdir tempo && \ tar xfz tempo_"${TEMPO_VERSION:1}"_linux_"${TARGETARCH}".tar.gz -C tempo/ && \ rm tempo_"${TEMPO_VERSION:1}"_linux_"${TARGETARCH}".tar.gz'