Merge pull request #2709 from hongwei1/obp-develop

refactor/secuty fix

Author: simonredfern

.github/Dockerfile_PreBuild

@@ -1,10 +1,7 @@
-FROM jetty:9.4-jdk11-alpine
+FROM gcr.io/distroless/java:11
 
-ENV JMX_EXPORTER_VERSION=1.2.0
-
-# To enable add "-javaagent:$JETTY_BASE/jmx-exporter.jar=8090:$JETTY_BASE/prometheus_config.yml" to the JAVA_OPTIONS
-RUN wget https://github.com/prometheus/jmx_exporter/releases/download/$JMX_EXPORTER_VERSION/jmx_prometheus_javaagent-$JMX_EXPORTER_VERSION.jar -o /var/lib/jetty/jmx-exporter.jar
-COPY .github/jmx_exporter.config /var/lib/jetty/prometheus_config.yml
 # Copy OBP source code
 # Copy build artifact (.war file) into jetty from 'maven' stage.
-COPY /obp-api/target/obp-api-1.*.war /var/lib/jetty/webapps/ROOT.war
+COPY /obp-http4s-runner/target/obp-http4s-runner.jar /app/obp-http4s-runner.jar
+WORKDIR /app
+CMD ["obp-http4s-runner.jar"]

.github/Dockerfile_PreBuild_Jmx

@@ -107,10 +107,11 @@ jobs:
             **/target/site/surefire-report.html
             **/target/site/surefire-report/*
 
-      - name: Save .war artifact
+      - name: Save .jar artifact
+        continue-on-error: true
         run: |
           mkdir -p ./push
-          cp obp-api/target/obp-api-1.*.war ./push/
+          cp obp-http4s-runner/target/obp-http4s-runner.jar ./push/
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}

.github/workflows/build_container.yml

@@ -111,10 +111,10 @@ jobs:
             **/target/site/surefire-report.html
             **/target/site/surefire-report/*
 
-      - name: Save .war artifact
+      - name: Save .jar artifact
         run: |
           mkdir -p ./pull
-          cp obp-api/target/obp-api-1.*.war ./pull/
+          cp obp-http4s-runner/target/obp-http4s-runner.jar ./pull/
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}