Fix docker build

Issue-ID: AAI-4221
Change-Id: I2cc45c43ef4043196adeac22ec360ad30ffecf09
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/aai-resources/src/main/docker/Dockerfile b/aai-resources/src/main/docker/Dockerfile
index 9de4fc1..aa909dd 100644 (file)
--- a/aai-resources/src/main/docker/Dockerfile
+++ b/aai-resources/src/main/docker/Dockerfile
@@ -1,10 +1,6 @@
 FROM eclipse-temurin:17-jre-alpine
 
 ENV SERVER_PORT=8447
-ENV JAVA_TOOL_OPTIONS="-javaagent:/opt/app/opentelemetry/opentelemetry-javaagent.jar"
-
-USER nobody
-
 EXPOSE ${SERVER_PORT}
 
 WORKDIR /opt/app/aai-resources
@@ -15,7 +11,10 @@ WORKDIR /opt/app/aai-resources
 ARG AGENT_VERSION=2.24.0
 
 RUN mkdir -p /opt/app/opentelemetry && \
-    wget -O /opt/app/opentelemetry/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${AGENT_VERSION}/opentelemetry-javaagent.jar
+    wget -O /opt/app/opentelemetry/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${AGENT_VERSION}/opentelemetry-javaagent.jar && \
+    chown -R nobody:nobody /opt/app
+
+USER nobody
 
 COPY --chown=nobody:nobody /maven/aai-resources/ .
 

diff --git a/aai-resources/src/main/docker/docker-entrypoint.sh b/aai-resources/src/main/docker/docker-entrypoint.sh
index f7e5959..d6a5f72 100644 (file)
--- a/aai-resources/src/main/docker/docker-entrypoint.sh
+++ b/aai-resources/src/main/docker/docker-entrypoint.sh
@@ -67,4 +67,8 @@ JAVA_OPTS="${JAVA_OPTS} ${POST_JAVA_OPTS}";
 
 JAVA_MAIN_JAR=$(ls lib/aai-resources*.jar);
 
+if [ "${OTEL_AGENT_TRACING_ENABLED}" = "true" ]; then
+        export JAVA_TOOL_OPTIONS="-javaagent:/opt/app/opentelemetry/opentelemetry-javaagent.jar"
+fi
+
 ${JAVA_CMD} ${JVM_OPTS} ${JAVA_OPTS} -jar ${JAVA_MAIN_JAR};