Slår på remote debugging i dev. (#2003)

Author: mrsladek

.deploy/dev-fss-teamforeldrepenger.yaml

@@ -97,3 +97,5 @@ spec:
 
     - name: SKAL_INNENTE_YTELSE_ANVIST_ANDELER
       value: "true"
+    - name: APPD_ENABLED
+      value: "false"

.deploy/prod-fss-teamforeldrepenger.yaml

@@ -96,3 +96,5 @@ spec:
 
     - name: SKAL_INNENTE_YTELSE_ANVIST_ANDELER
       value: "true"
+    - name: APPD_ENABLED
+      value: "true"

.scripts/03-import-appdynamics.sh renamed to .scripts/03-import-appd.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Enables remote debugging on port 5005 if the application is running in a development cluster
+
+if [ "$NAIS_CLUSTER_NAME" = "dev-fss" ] || [ "$NAIS_CLUSTER_NAME" = "dev-gcp" ]; then
+  export JAVA_OPTS="${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
+fi

.scripts/08-remote-debug.sh

@@ -1,24 +1,24 @@
-FROM navikt/java:17-appdynamics
+FROM navikt/temurin:17-appdynamics
 
 LABEL org.opencontainers.image.source=https://github.com/navikt/fp-abakus
-ENV APPD_ENABLED=true
+ENV TZ=Europe/Oslo
 
 RUN mkdir lib
-RUN mkdir webapp
 RUN mkdir conf
 
-# Config
-COPY web/target/classes/logback*.xml conf/
-
-# Application Container (Jetty)
-COPY web/target/app.jar .
-COPY web/target/lib/*.jar ./
-
 ENV JAVA_OPTS="-XX:MaxRAMPercentage=75.0 \
     -Djava.security.egd=file:/dev/urandom \
     -Duser.timezone=Europe/Oslo \
     -Dlogback.configurationFile=conf/logback.xml"
 
 # Export vault properties
-COPY .scripts/03-import-appdynamics.sh /init-scripts/03-import-appdynamics.sh
-COPY .scripts/05-import-users.sh /init-scripts/05-import-users.sh
+COPY --chown=apprunner:root .scripts/03-import-appd.sh /init-scripts/03-import-appd.sh
+COPY --chown=apprunner:root .scripts/05-import-users.sh /init-scripts/05-import-users.sh
+COPY --chown=apprunner:root .scripts/08-remote-debug.sh /init-scripts/08-remote-debug.sh
+
+# Config
+COPY web/target/classes/logback*.xml conf/
+
+# Application Container (Jetty)
+COPY web/target/app.jar .
+COPY web/target/lib/*.jar ./