From 2a94eeb501e76b2bd0eead5666e9d98777332291 Mon Sep 17 00:00:00 2001
From: Niclas Thobaben <niclas.thobaben@nclazz.de>
Date: Tue, 15 Feb 2022 15:27:16 +0100
Subject: [PATCH] Added Database Credentials  #3

---
 Jenkinsfile                                     | 5 ++++-
 docker-compose.yml                              | 3 +++
 pom.xml                                         | 5 ++++-
 src/main/resources/application-swarm.properties | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/application-swarm.properties

diff --git a/Jenkinsfile b/Jenkinsfile
index 0782a41..1632be2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,6 +5,7 @@ pipeline {
         NEXUS = credentials('jenkins_nexus')
         MAIL = credentials('robots_mail')
         NCLAZZ = credentials('nclazz_api_token')
+        DB = credentials('sql01_service')
 
         DOCKER_REGISTRY = "docker.nclazz.de"
         DOCKER_GROUP = 'nclazz-service'
@@ -107,6 +108,8 @@ pipeline {
                                 VERSION: env.DOCKER_VERSION,
                                 MAIL_USERNAME: env.MAIL_USR,
                                 MAIL_PASSWORD: env.MAIL_PSW,
+                                DB_USERNAME: env.DB_USR,
+                                DB_PASSWORD: env.DB_PSW,
                                 AUTH_TOKEN: env.NCLAZZ
                         ]
                 )
@@ -114,7 +117,7 @@ pipeline {
                         name: 'nclazz-email-relay',
                         fqdn: 'api.nclazz.de',
                         description: 'nclazz email relay service',
-                        location: '/mail',
+                        location: '/mail/',
                         backendPort: 7006
                 )
             }
diff --git a/docker-compose.yml b/docker-compose.yml
index 02099a3..4071344 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,9 @@ services:
     environment:
       SPRING_MAIL_USERNAME: "${MAIL_USERNAME}"
       SPRING_MAIL_PASSWORD: "${MAIL_PASSWORD}"
+      SPRING_DATASOURCE_USERNAME: "${DB_USERNAME}"
+      SPRING_DATASOURCE_PASSWORD: "${DB_PASSWORD}"
+      SPRING_PROFILES_ACTIVE: swarm
       NCLAZZ_AUTH_TOKEN: "${AUTH_TOKEN}"
     stop_grace_period: 60s
     deploy:
diff --git a/pom.xml b/pom.xml
index 18e1d76..56aaa05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,10 @@
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
-
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/src/main/resources/application-swarm.properties b/src/main/resources/application-swarm.properties
new file mode 100644
index 0000000..7d452b0
--- /dev/null
+++ b/src/main/resources/application-swarm.properties
@@ -0,0 +1,2 @@
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://sql01.nclazz.de/prod_nclazz_mail_relay
\ No newline at end of file