fix: simplify Java agent download in instrumentation Dockerfile
This commit is contained in:
@@ -40,16 +40,9 @@ RUN curl -L --retry 3 --retry-delay 5 --max-time 120 \
|
|||||||
# Uses GitHub API to get proper redirect
|
# Uses GitHub API to get proper redirect
|
||||||
# ═══════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════
|
||||||
ENV OTEL_JAVA_VERSION=2.1.0
|
ENV OTEL_JAVA_VERSION=2.1.0
|
||||||
RUN JAVA_URL=$(curl -sL "https://api.github.com/repos/open-telemetry/opentelemetry-java-instrumentation/releases/tags/v${OTEL_JAVA_VERSION}" | \
|
RUN mkdir -p /otel/java && \
|
||||||
jq -r '.assets[] | select(.name=="opentelemetry-javaagent.jar") | .browser_download_url') && \
|
curl -L --retry 3 --max-time 180 -o /otel/java/opentelemetry-javaagent.jar \
|
||||||
if [ -n "$JAVA_URL" ] && [ "$JAVA_URL" != "null" ]; then \
|
"https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OTEL_JAVA_VERSION}/opentelemetry-javaagent.jar" && \
|
||||||
curl -L --retry 3 --max-time 180 "$JAVA_URL" -o /otel/java/opentelemetry-javaagent.jar; \
|
|
||||||
else \
|
|
||||||
echo "Downloading Java agent directly..." && \
|
|
||||||
curl -L --retry 3 --max-time 180 \
|
|
||||||
"https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OTEL_JAVA_VERSION}/opentelemetry-javaagent.jar" \
|
|
||||||
-o /otel/java/opentelemetry-javaagent.jar; \
|
|
||||||
fi && \
|
|
||||||
ls -la /otel/java/
|
ls -la /otel/java/
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════
|
||||||
|
|||||||
Reference in New Issue
Block a user