From cbc57d22f88f47221257454590d4e80d19a2fd27 Mon Sep 17 00:00:00 2001
From: Thomas Peetz <thomas.peetz@ingenieurbuero-peetz.de>
Date: Sun, 30 Mar 2025 04:17:58 +0200
Subject: [PATCH] add Docker build and domcker-compose file

---
 springboot/Dockerfile                         |  5 ++
 springboot/docker-compose.yml                 | 32 +++++++++++
 springboot/src/main/resources/application.yml | 56 ++++++++++++-------
 3 files changed, 73 insertions(+), 20 deletions(-)
 create mode 100644 springboot/Dockerfile
 create mode 100644 springboot/docker-compose.yml

diff --git a/springboot/Dockerfile b/springboot/Dockerfile
new file mode 100644
index 0000000..1ac7138
--- /dev/null
+++ b/springboot/Dockerfile
@@ -0,0 +1,5 @@
+FROM alpine/java:21-jdk
+WORKDIR /
+ADD build/libs/kontor-spring-0.1.0-SNAPSHOT.jar app.jar
+EXPOSE 8000
+CMD java -jar -Dspring.profiles.active=prod -Dvaadin.productionMode=true app.jar
diff --git a/springboot/docker-compose.yml b/springboot/docker-compose.yml
new file mode 100644
index 0000000..0adf164
--- /dev/null
+++ b/springboot/docker-compose.yml
@@ -0,0 +1,32 @@
+
+services:
+  mariadb:
+    image: mariadb
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: kontor
+      MYSQL_USER: kontor
+      MYSQL_PASSWORD: kontor
+      MYSQL_DATABASE: kontor
+    ports:
+      - 3316:3306
+    networks:
+      - back-end
+    volumes:
+      - mariadb-storage:/var/lib/mysql:rw
+  kontor:
+    image: kontor
+    restart: unless-stopped
+    networks:
+      - back-end
+      - front-end
+    ports:
+      - 8000:8000
+
+networks:
+  back-end:
+  front-end:
+
+volumes:
+  mariadb-storage:
+
diff --git a/springboot/src/main/resources/application.yml b/springboot/src/main/resources/application.yml
index fd8dfff..696dd47 100644
--- a/springboot/src/main/resources/application.yml
+++ b/springboot/src/main/resources/application.yml
@@ -1,5 +1,3 @@
-server:
-  port: 8085
 app:
   name: 'Kontor'
   shortName: 'Kontor'
@@ -7,24 +5,6 @@ app:
 spring:
   profiles:
     active: local,dev,test,prod
-  devtools:
-    add-properties: false
-  datasource:
-    driverClassName: org.mariadb.jdbc.Driver
-    url: jdbc:mariadb://localhost:3306/kontor
-    username: 'kontor'
-    password: 'kontor'
-    #driverClassName: org.hsqldb.jdbc.JDBCDriver
-    #url: jdbc:hsqldb:file:kontorHSQLDB
-    #username: 'sa'
-    #password: 'sa'
-  #jpa
-    #database-platform: org.hibernate.community.dialect.SQLiteDialect
-  #datasource
-    #driverClassName: org.sqlite.JDBC
-    #url: "jdbc:sqlite:file:./kontorDb?cache=shared"
-    #username=sa
-    #password=sa
   jpa:
     defer-datasource-initialization: true
     #hibernate.ddl-auto=create-drop
@@ -65,3 +45,39 @@ mail:
     userName: 'thomas.peetz@thpeetz.de'
     password: 'fS9f4JYDIO7A'
     starttls: true
+---
+spring:
+  config:
+    activate:
+      on-profile: prod
+  datasource:
+    driverClassName: org.mariadb.jdbc.Driver
+    url: jdbc:mariadb://mariadb:3306/kontor
+    username: 'kontor'
+    password: 'kontor'
+server:
+  port: 8000
+---
+spring:
+  config:
+    activate:
+      on-profile: local, dev, test
+  devtools:
+    add-properties: false
+  datasource:
+    driverClassName: org.mariadb.jdbc.Driver
+    url: jdbc:mariadb://localhost:3306/kontor
+    username: 'kontor'
+    password: 'kontor'
+    #driverClassName: org.hsqldb.jdbc.JDBCDriver
+    #url: jdbc:hsqldb:file:kontorHSQLDB
+    #username: 'sa'
+    #password: 'sa'
+    #driverClassName: org.sqlite.JDBC
+    #url: "jdbc:sqlite:file:./kontorDb?cache=shared"
+    #username=sa
+    #password=sa
+  #jpa
+    #database-platform: org.hibernate.community.dialect.SQLiteDialect
+server:
+  port: 8085