From 052279458af3fedf7224f0d42fc54cd6e9ef5e53 Mon Sep 17 00:00:00 2001
From: Teresa Noviello <Teresa.Noviello@instana.com>
Date: Thu, 28 Apr 2022 13:36:40 +0000
Subject: [PATCH] Set nginx server version to 1.21.6, allow the download of the
 latest sensor

---
 web/Dockerfile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/web/Dockerfile b/web/Dockerfile
index ee1b067..1f9ffc1 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -5,19 +5,24 @@ WORKDIR /instana
 
 RUN apk add --update --no-cache curl
 
-RUN if [ -n "$KEY" ]; then curl \
+ENV ARTI_PATH='https://artifact-public.instana.io/artifactory/shared/com/instana/nginx_tracing/'
+
+RUN if [ -n "$KEY" ]; then \
+    sensor_version=$(curl --user "_:$KEY" ${ARTI_PATH} | grep -o '>[0-9]\+\.[0-9]\+\.[0-9]\+'| cut -f 2 -d '>'|sort -V|tail -1 ); \
+    echo "Downloading sensor version ${sensor_version} for Nginx version 1.21.6" ; \
+    curl \
     --output instana.zip \
     --user "_:$KEY" \
-    https://artifact-public.instana.io/artifactory/shared/com/instana/nginx_tracing/1.1.2/linux-amd64-glibc-nginx-1.20.1.zip && \
+    ${ARTI_PATH}/${sensor_version}/linux-amd64-glibc-nginx-1.21.6.zip && \
     unzip instana.zip && \
     mv glibc-libinstana_sensor.so libinstana_sensor.so && \
-    mv glibc-nginx-1.20.1-ngx_http_ot_module.so ngx_http_opentracing_module.so; \
+    mv glibc-nginx-1.21.6-ngx_http_ot_module.so ngx_http_opentracing_module.so; \
     else echo "KEY not provided. Not adding tracing"; \
     touch dummy.so; \
     fi
 
 
-FROM nginx:1.20.1
+FROM nginx:1.21.6
 
 EXPOSE 8080