From d8ca8d5235214c906cfc38b7104f899425ae63e5 Mon Sep 17 00:00:00 2001
From: tawoe <weserwueter@posteo.de>
Date: Tue, 2 May 2023 17:24:14 +0200
Subject: [PATCH] change Dockerfile base image, add dockerignore

---
 .dockerignore                   |  3 +++
 .github/workflows/run_trivy.yml |  2 +-
 Dockerfile                      | 28 +++++-----------------------
 3 files changed, 9 insertions(+), 24 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..37639574d
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+obp-api/src/main/resources/props
+!obp-api/src/main/resources/props/sample.props.template
+!obp-api/src/main/resources/props/test.default.props.template
\ No newline at end of file
diff --git a/.github/workflows/run_trivy.yml b/.github/workflows/run_trivy.yml
index a55cbb2dc..a8a50366c 100644
--- a/.github/workflows/run_trivy.yml
+++ b/.github/workflows/run_trivy.yml
@@ -7,7 +7,7 @@ on:
       - completed
 env:
   ## Sets environment variable
-  DOCKER_HUB_ORGANIZATION: openbankproject
+  DOCKER_HUB_ORGANIZATION: ${{ vars.DOCKER_HUB_ORGANIZATION }}
   DOCKER_HUB_REPOSITORY: obp-api
 
 
diff --git a/Dockerfile b/Dockerfile
index b6cf19e38..d513791f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,13 @@
-FROM maven:3-jdk-8 as maven
+FROM maven:3-eclipse-temurin-11 as maven
 # Build the source using maven, source is copied from the 'repo' build.
 ADD . /usr/src/OBP-API
 RUN cp /usr/src/OBP-API/obp-api/pom.xml /tmp/pom.xml # For Packaging a local repository within the image
 WORKDIR /usr/src/OBP-API
 RUN cp obp-api/src/main/resources/props/test.default.props.template obp-api/src/main/resources/props/test.default.props
 RUN cp obp-api/src/main/resources/props/sample.props.template obp-api/src/main/resources/props/default.props
-RUN --mount=type=cache,target=/root/.m2 mvn install -pl .,obp-commons
-RUN --mount=type=cache,target=/root/.m2 mvn install -DskipTests -pl obp-api
+RUN --mount=type=cache,target=$HOME/.m2 MAVEN_OPTS="-Xmx3G -Xss2m" mvn install -pl .,obp-commons
+RUN --mount=type=cache,target=$HOME/.m2 MAVEN_OPTS="-Xmx3G -Xss2m" mvn install -DskipTests -pl obp-api
 
-FROM openjdk:8-jre-alpine
+FROM jetty:9.4-jdk11-alpine
 
-# Add user 
-RUN adduser -D obp
-
-# Download jetty
-RUN wget -O - https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.15.v20190215/jetty-distribution-9.4.15.v20190215.tar.gz | tar zx
-RUN mv jetty-distribution-* jetty
-
-# Copy OBP source code
-# Copy build artifact (.war file) into jetty from 'maven' stage.
-COPY --from=maven /usr/src/OBP-API/obp-api/target/obp-api-*.war jetty/webapps/ROOT.war
-
-WORKDIR jetty
-RUN chown -R  obp /jetty
-
-# Switch to the obp user (non root)
-USER obp
-
-# Starts jetty
-ENTRYPOINT ["java", "-jar", "start.jar"]
+COPY --from=maven /usr/src/OBP-API/obp-api/target/obp-api-1.*.war /var/lib/jetty/webapps/ROOT.war
\ No newline at end of file