From d4aed45def81c17afb5e0e37f6de0cb62b468743 Mon Sep 17 00:00:00 2001
From: karmaking <daniel@danieltippmann.de>
Date: Thu, 25 Jul 2024 13:26:25 +0200
Subject: [PATCH] clean up, edit readme

---
 .gitignore                                              | 2 --
 Dockerfile                                              | 6 ++----
 README.md                                               | 6 ++++++
 application.properties => application.properties.docker | 0
 entrypoint.sh                                           | 5 -----
 5 files changed, 8 insertions(+), 11 deletions(-)
 rename application.properties => application.properties.docker (100%)
 delete mode 100644 entrypoint.sh

diff --git a/.gitignore b/.gitignore
index 2a897dd..c021489 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,5 +34,3 @@ build/
 /src/main/resources/application-local.properties
 /src/main/resources/application-remote.properties
 /src/main/resources/cert/
-
-.application.env
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index ad60d76..b708fe3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,9 +6,7 @@ RUN MAVEN_OPTS="-Xmx3G -Xss2m" mvn clean package
 FROM openjdk:17-jdk-alpine
 
 COPY --from=maven target/obp-hola-app-*-SNAPSHOT.jar obp-hola.jar
-COPY application.properties application.properties
-#COPY  --chmod=777 entrypoint.sh entrypoint.sh
-#RUN chmod +x entrypoint.sh
+COPY application.properties.docker application.properties
 EXPOSE 8087
 ENTRYPOINT ["java","-jar","/obp-hola.jar"]
-#ENTRYPOINT ["/entrypoint.sh"]
+
diff --git a/README.md b/README.md
index 3b9975b..98d2aaf 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,12 @@ Create `application.properties` according to `application.properties.example`:
 
 While the app is running, point your browser to the configured port on localhost (e.g. `http://localhost:8087`) to start the consent flow.
 
+## Build and Run in Docker/Kubernetes
+
+The included Dockerfile will build Hola using Maven and create an image.
+
+Please see `application.properties.docker` for all vars to pass to the container for configuration.
+
 ## Screenshots of the app
 
 ### Landing page
diff --git a/application.properties b/application.properties.docker
similarity index 100%
rename from application.properties
rename to application.properties.docker
diff --git a/entrypoint.sh b/entrypoint.sh
deleted file mode 100644
index 8927918..0000000
--- a/entrypoint.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-#echo $KEYSTORE_BASE64 | base64 -d > /etc/ssl/certs/keystore.jks
-#echo $TRUSTSTORE_BASE64 | base64 -d > /etc/ssl/certs/truststore.jks
-sleep 300
-exec java -jar /obp-hola.jar
\ No newline at end of file