From f41a1043c9dc48ea41e018fe4a5220b248aa833e Mon Sep 17 00:00:00 2001
From: GovardhanGitHub <mopur.govardhan05@gmail.com>
Date: Sat, 28 Sep 2024 23:42:55 +0530
Subject: [PATCH] docker config done

---
 docker-compose.yml                            | 29 +++++++++++++++++++
 support-portal-backend/Dockerfile             | 15 ++++++++++
 support-portal-backend/pom.xml                | 22 +++++++-------
 .../backend/mapper/ProfessorMapper.java       |  2 +-
 .../backend/mapper/UserMapper.java            |  2 +-
 .../src/main/resources/application.yml        |  1 +
 6 files changed, 58 insertions(+), 13 deletions(-)
 create mode 100644 docker-compose.yml
 create mode 100644 support-portal-backend/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..575284e
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,29 @@
+#       - DATABASE_HOST=mysql-common-mysql-1
+
+
+services:
+  cmc-new-backend:
+    build:
+      context: ./support-portal-backend
+      dockerfile: Dockerfile
+    restart: always
+    ports:
+      - "8070:8080"
+    environment:
+      - DATABASE_HOST=mysql-common-mysql-1
+    networks:
+      - cmc-forntend
+      - mysql-common_mynetwork
+    # depends_on:
+    #   db:
+    #     condition: service_healthy
+  
+ 
+volumes:
+  db-data: {}
+# secrets:
+#   db-password:
+#     file: db/password.txt
+networks:
+  cmc-forntend: {}
+  mysql-common_mynetwork: {}
\ No newline at end of file
diff --git a/support-portal-backend/Dockerfile b/support-portal-backend/Dockerfile
new file mode 100644
index 0000000..1fc1315
--- /dev/null
+++ b/support-portal-backend/Dockerfile
@@ -0,0 +1,15 @@
+FROM --platform=$BUILDPLATFORM maven:3.8.5-eclipse-temurin-17 AS builder
+WORKDIR /workdir/server
+COPY pom.xml /workdir/server/pom.xml
+RUN mvn dependency:go-offline
+
+COPY src /workdir/server/src
+RUN mvn package -Dmaven.test.skip=true
+RUN ls -la target/
+
+FROM eclipse-temurin:17-jre-focal
+
+EXPOSE 8080
+VOLUME /tmp
+COPY --from=builder /workdir/server/target/*.jar /app/app.jar
+ENTRYPOINT ["java","-jar","/app/app.jar"]
\ No newline at end of file
diff --git a/support-portal-backend/pom.xml b/support-portal-backend/pom.xml
index 133fa61..276bb44 100644
--- a/support-portal-backend/pom.xml
+++ b/support-portal-backend/pom.xml
@@ -15,8 +15,11 @@
     <description>Demo project for Spring Boot</description>
     <properties>
         <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
-        <mapstruct.version>1.4.2.Final</mapstruct.version>
+
+        <mapstruct.version>1.5.5.Final</mapstruct.version>
 
         <docker.image.prefix>artarkatesoft</docker.image.prefix>
         <docker.image.name>angular-${project.artifactId}</docker.image.name>
@@ -164,6 +167,12 @@
 
     <build>
         <plugins>
+
+
+
+
+
+
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -201,16 +210,7 @@
                         </path>
 
                     </annotationProcessorPaths>
-                    <compilerArgs>
-                        <compilerArg>
-
-                    <arg>-Amapstruct.defaultComponentModel=spring</arg>
-                    <arg>-Amapstruct.verbose=true</arg>  
-                                              
-                        </compilerArg>
-
-
-                    </compilerArgs>
+                  
                 </configuration>
             </plugin>
 
diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/ProfessorMapper.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/ProfessorMapper.java
index 9f19627..a92e3b7 100644
--- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/ProfessorMapper.java
+++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/ProfessorMapper.java
@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 
-@Mapper( )
+@Mapper(componentModel = "spring")
 public interface ProfessorMapper {
 
     // @Mapping(target = "professorId", ignore = true) // Auto-generated
diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java
index b8f993e..9e4dfce 100644
--- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java
+++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/mapper/UserMapper.java
@@ -7,7 +7,7 @@ import org.mapstruct.Mapping;
 
 import java.time.LocalDateTime;
 
-@Mapper(imports = {LocalDateTime.class})
+@Mapper(componentModel = "spring",imports = {LocalDateTime.class})
 public interface UserMapper {
 
     @Mapping(target = "isNotLocked", source = "notLocked")
diff --git a/support-portal-backend/src/main/resources/application.yml b/support-portal-backend/src/main/resources/application.yml
index b42e113..2115523 100644
--- a/support-portal-backend/src/main/resources/application.yml
+++ b/support-portal-backend/src/main/resources/application.yml
@@ -24,6 +24,7 @@ spring:
             enable: false
   datasource:
     url: jdbc:mysql://210.18.189.94:8098/demo
+    # url: jdbc:mysql://${MYSQL_HOST:db}:8098/demo
     username: youruser
     password: youruserpassword
     driver-class-name: com.mysql.cj.jdbc.Driver