Merge pull request #143 from rostilos/1.5.1-rc

feat: Update Dockerfiles to download New Relic Java agent dynamically…

Author: rostilos

java-ecosystem/services/pipeline-agent/Dockerfile.observable

@@ -6,37 +6,41 @@ COPY ./target/codecrow-pipeline-agent-1.0.jar ./codecrow-pipeline-agent-1.0.jar
 
 FROM openjdk:17.0.2-jdk-slim-bullseye
 
-
 RUN apt-get update && \
-    apt-get install -y curl && \
+    apt-get install -y curl unzip && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
 RUN groupadd -r appgroup && useradd -r -g appgroup appuser
-RUN mkdir -p /app/logs /usr/local/newrelic
-
+RUN mkdir -p /app/logs && chown -R appuser:appgroup /app
 
 WORKDIR /app
 
 # Copy the built jar file
-#COPY ./codecrow-pipeline-agent/mcp-server ./codecrow-pipeline-agent/mcp-server
 COPY --from=builder /app/codecrow-pipeline-agent-1.0.jar app.jar
 
-COPY newrelic.jar /usr/local/newrelic/newrelic.jar
-COPY newrelic.yml /usr/local/newrelic/newrelic.yml
-RUN chown -R appuser:appgroup /app /usr/local/newrelic && \
-    chmod 644 /usr/local/newrelic/newrelic.jar
+# Download New Relic Java agent (config newrelic.yml is mounted at runtime)
+RUN mkdir -p /usr/local/newrelic && \
+    curl -fsSL https://download.newrelic.com/newrelic/java-agent/newrelic-agent/current/newrelic-java.zip \
+         -o /tmp/newrelic-java.zip && \
+    unzip -jo /tmp/newrelic-java.zip 'newrelic/newrelic.jar' -d /usr/local/newrelic/ && \
+    rm /tmp/newrelic-java.zip && \
+    chmod 644 /usr/local/newrelic/newrelic.jar && \
+    chown -R appuser:appgroup /app /usr/local/newrelic
 
-#NEW Relic installation
 # Change ownership
-RUN chown -R appuser:appgroup /app
+RUN chown appuser:appgroup app.jar
 
 # Switch to non-root user
 USER appuser
 
 # Expose port
 EXPOSE 8082
 
+# New Relic config via environment (override at runtime via docker-compose)
+# NEW_RELIC_APP_NAME and NEW_RELIC_LICENSE_KEY must be set at runtime
+ENV NEW_RELIC_LOG_FILE_NAME=STDOUT
+
 # JVM options
 ENV JAVA_OPTS="-Xms512m -Xmx1g -javaagent:/usr/local/newrelic/newrelic.jar -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:+UseStringDeduplication"
 

java-ecosystem/services/web-server/Dockerfile.observable

@@ -7,7 +7,7 @@ COPY ./target/codecrow-web-server-1.0-exec.jar ./codecrow-web-server-1.0.jar
 FROM openjdk:17.0.2-jdk-slim-bullseye
 
 RUN apt-get update && \
-    apt-get install -y curl && \
+    apt-get install -y curl unzip && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -19,10 +19,14 @@ WORKDIR /app
 # Copy the built jar file
 COPY --from=builder /app/codecrow-web-server-1.0.jar app.jar
 
-COPY newrelic.jar /usr/local/newrelic/newrelic.jar
-COPY newrelic.yml /usr/local/newrelic/newrelic.yml
-RUN chown -R appuser:appgroup /app /usr/local/newrelic && \
-    chmod 644 /usr/local/newrelic/newrelic.jar
+# Download New Relic Java agent (config newrelic.yml is mounted at runtime)
+RUN mkdir -p /usr/local/newrelic && \
+    curl -fsSL https://download.newrelic.com/newrelic/java-agent/newrelic-agent/current/newrelic-java.zip \
+         -o /tmp/newrelic-java.zip && \
+    unzip -jo /tmp/newrelic-java.zip 'newrelic/newrelic.jar' -d /usr/local/newrelic/ && \
+    rm /tmp/newrelic-java.zip && \
+    chmod 644 /usr/local/newrelic/newrelic.jar && \
+    chown -R appuser:appgroup /app /usr/local/newrelic
 
 # Change ownership
 RUN chown appuser:appgroup app.jar
@@ -37,6 +41,10 @@ EXPOSE 8081
 HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
   CMD curl -f http://localhost:8081/actuator/health || exit 1
 
+# New Relic config via environment (override at runtime via docker-compose)
+# NEW_RELIC_APP_NAME and NEW_RELIC_LICENSE_KEY must be set at runtime
+ENV NEW_RELIC_LOG_FILE_NAME=STDOUT
+
 # JVM options
 ENV JAVA_OPTS="-Xms512m -Xmx1g -javaagent:/usr/local/newrelic/newrelic.jar -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:+UseStringDeduplication"