fix version

.github/workflows/renovate.yml

@@ -19,7 +19,7 @@ jobs:
           app_id: ${{ secrets.RENOVATEGRAFANABOT_ID }}
           private_key: ${{ secrets.RENOVATEGRAFANABOT_PEM }}
       - name: Self-hosted Renovate
-        uses: renovatebot/[email protected] #v.39.0.5
+        uses: renovatebot/[email protected]
         with:
           renovate-version: 37.5.3@sha256:613fe86ea2730c062a42bf097a02563e35cb0d8df4fef08d2c4e50b8cd2ccdbc
           configurationFile: .github/renovate.json

docker/Dockerfile

@@ -22,30 +22,30 @@ WORKDIR /otel-lgtm
 
 RUN yum install -y unzip jq procps dos2unix
 
-RUN curl -sOL https://dl.grafana.com/oss/release/grafana-$GRAFANA_VERSION.linux-${TARGETARCH}.tar.gz && \
-    tar xfz grafana-$GRAFANA_VERSION.linux-${TARGETARCH}.tar.gz && \
-    rm grafana-$GRAFANA_VERSION.linux-${TARGETARCH}.tar.gz && \
-    mv grafana-v$GRAFANA_VERSION grafana/
+RUN bash -c 'curl -sOL https://dl.grafana.com/oss/release/grafana-"$GRAFANA_VERSION".linux-"${TARGETARCH}".tar.gz && \
+    tar xfz grafana-"$GRAFANA_VERSION".linux-"${TARGETARCH}".tar.gz && \
+    rm grafana-"$GRAFANA_VERSION".linux-"${TARGETARCH}".tar.gz && \
+    mv grafana-v"$GRAFANA_VERSION" grafana/'
 
-RUN curl -sOL https://github.com/prometheus/prometheus/releases/download/v$PROMETHEUS_VERSION/prometheus-$PROMETHEUS_VERSION.linux-${TARGETARCH}.tar.gz && \
-    tar xfz prometheus-$PROMETHEUS_VERSION.linux-${TARGETARCH}.tar.gz && \
-    mv prometheus-$PROMETHEUS_VERSION.linux-${TARGETARCH} prometheus && \
-    rm prometheus-$PROMETHEUS_VERSION.linux-${TARGETARCH}.tar.gz
+RUN bash -c 'curl -sOL https://github.com/prometheus/prometheus/releases/download/"${PROMETHEUS_VERSION}"/prometheus-"${PROMETHEUS_VERSION:1}".linux-"${TARGETARCH}".tar.gz && \
+    tar xfz prometheus-"${PROMETHEUS_VERSION:1}".linux-"${TARGETARCH}".tar.gz && \
+    mv prometheus-"${PROMETHEUS_VERSION:1}".linux-"${TARGETARCH}" prometheus && \
+    rm prometheus-"${PROMETHEUS_VERSION:1}".linux-"${TARGETARCH}".tar.gz'
 
-RUN 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/v"$TEMPO_VERSION"/tempo_"${TEMPO_VERSION}"_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}"_linux_"${TARGETARCH}".tar.gz -C tempo/ && \
+    rm tempo_"${TEMPO_VERSION}"_linux_"${TARGETARCH}".tar.gz'
 
-RUN curl -sOL https://github.com/grafana/loki/releases/download/v$LOKI_VERSION/loki-linux-${TARGETARCH}.zip && \
+RUN bash -c 'curl -sOL https://github.com/grafana/loki/releases/download/v"$LOKI_VERSION"/loki-linux-"${TARGETARCH}".zip && \
     mkdir loki && \
-    unzip loki-linux-${TARGETARCH} -d loki/ && \
-    rm loki-linux-${TARGETARCH}.zip
+    unzip loki-linux-"${TARGETARCH}" -d loki/ && \
+    rm loki-linux-"${TARGETARCH}".zip'
 
-RUN curl -sOL https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v$OPENTELEMETRY_COLLECTOR_VERSION/otelcol-contrib_${OPENTELEMETRY_COLLECTOR_VERSION}_linux_${TARGETARCH}.tar.gz && \
+RUN bash -c 'curl -sOL https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v"$OPENTELEMETRY_COLLECTOR_VERSION"/otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION}"_linux_"${TARGETARCH}".tar.gz && \
     mkdir otelcol-contrib && \
-    tar xfz otelcol-contrib_${OPENTELEMETRY_COLLECTOR_VERSION}_linux_${TARGETARCH}.tar.gz -C otelcol-contrib/ && \
-    rm otelcol-contrib_${OPENTELEMETRY_COLLECTOR_VERSION}_linux_${TARGETARCH}.tar.gz
+    tar xfz otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION}"_linux_"${TARGETARCH}".tar.gz -C otelcol-contrib/ && \
+    rm otelcol-contrib_"${OPENTELEMETRY_COLLECTOR_VERSION}"_linux_"${TARGETARCH}".tar.gz'
 
 COPY prometheus.yaml .
 COPY run-prometheus.sh .

docker/logging.sh

@@ -9,10 +9,10 @@ function run_with_logging(){
   shift
   command=$*
   if [[ ${envvar} == "true" || ${ENABLE_LOGS_ALL:-false} == "true" ]]; then
-    echo "Running ${name} with logging"
+    echo "Running ${name} logging=true"
     ${command}
   else
-    echo "Running ${name} without logging"
+    echo "Running ${name} logging=false"
     ${command} > /dev/null 2>&1
   fi
 }