From 6ecb625a61e15457518958f3a8b6b27a1ea4d46e Mon Sep 17 00:00:00 2001
From: yb <unconfigured@null.spigotmc.org>
Date: Wed, 13 Jul 2022 02:14:14 +0200
Subject: [PATCH] a

---
 server/docker-compose.yml | 43 +++++++++++++++++++++++----------------
 server/shell/Dockerfile   | 12 +++++++++++
 server/shell/pom.xml      | 35 ++++++++++++++++++++++++-------
 webcoreroot/dto/pom.xml   |  8 ++++++--
 4 files changed, 71 insertions(+), 27 deletions(-)
 create mode 100644 server/shell/Dockerfile

diff --git a/server/docker-compose.yml b/server/docker-compose.yml
index 0e3877a..532b912 100644
--- a/server/docker-compose.yml
+++ b/server/docker-compose.yml
@@ -15,25 +15,9 @@ services:
       - spring-cloud-network
     restart: always
 
-    #service 2: definition of phpMyAdmin
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin:latest
-    container_name: my-php-myadmin
-    ports:
-      - "8082:80"
-    restart: always
-
-    networks:
-      - spring-cloud-network
-    depends_on:
-      - db
-    environment:
-      SPRING_DATASOURCE_USERNAME: root
-      SPRING_DATASOURCE_PASSWORD: 0cscadmin1
-
 
   #service 3: definition of your spring-boot app
-  cfgserver:                        #it is just a name, which will be used only in this file.
+  restserver:                        #it is just a name, which will be used only in this file.
     image: appserver-service               #name of the image after dockerfile executes
     container_name: appserver-service-app  #name of the container created from docker image
 
@@ -55,8 +39,31 @@ services:
       SPRING_JPA_HIBERNATE_DDL_AUTO: update
 
 
+  #service 3: definition of your spring-boot app
+  shellserver:                        #it is just a name, which will be used only in this file.
+    image: shellserver-service               #name of the image after dockerfile executes
+    container_name: shellserver-service-app  #name of the container created from docker image
+
+    build:
+      context: ./shell          #docker file path (. means root directory)
+      dockerfile: Dockerfile              #docker file name
+    ports:
+      - "8089:8082"                       #docker container port with your os port
+    restart: "no"
+
+    networks:
+      - spring-cloud-network
+    depends_on:                           #define dependencies of this app
+      - db                                #dependency name (which is defined with this name 'db' in this file earlier)
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:mysql://mysql-db:3306/property?createDatabaseIfNotExist=false
+      SPRING_DATASOURCE_USERNAME: root
+      SPRING_DATASOURCE_PASSWORD: 0cscadmin1
+      SPRING_JPA_HIBERNATE_DDL_AUTO: update
+
+
 
 
 networks:
   spring-cloud-network:
-    driver: bridge
\ No newline at end of file
+    driver: bridge
diff --git a/server/shell/Dockerfile b/server/shell/Dockerfile
new file mode 100644
index 0000000..5bf0357
--- /dev/null
+++ b/server/shell/Dockerfile
@@ -0,0 +1,12 @@
+
+FROM openjdk:8-jdk-alpine
+
+ARG JAR_FILE=target/*.jar
+ARG JAR_DEPENDENDIES=target/alternateLocation
+
+ARG DEPENDENCY=target/dependency
+COPY ${JAR_FILE} app.jar
+#EXPOSE 3999:3999
+COPY  ${JAR_DEPENDENDIES} ./
+#RUN ls -al
+ENTRYPOINT ["java","-jar","/app.jar"]
diff --git a/server/shell/pom.xml b/server/shell/pom.xml
index 6bc9ae1..2d90fab 100644
--- a/server/shell/pom.xml
+++ b/server/shell/pom.xml
@@ -14,11 +14,12 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <dependencies><dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>core</artifactId>
-        <version>${project.version}</version>
-    </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.shell</groupId>
             <artifactId>spring-shell-starter</artifactId>
@@ -71,7 +72,7 @@
         <resources>
             <resource>
                 <directory>${project.basedir}/../resources</directory>
-            <filtering>true</filtering>
+                <filtering>true</filtering>
             </resource>
 
         </resources>
@@ -87,7 +88,27 @@
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/alternateLocation</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/webcoreroot/dto/pom.xml b/webcoreroot/dto/pom.xml
index de923f4..03da3e2 100644
--- a/webcoreroot/dto/pom.xml
+++ b/webcoreroot/dto/pom.xml
@@ -42,7 +42,6 @@
             </plugin>
 
 
-
             <plugin>
                 <groupId>org.jsonschema2pojo</groupId>
                 <artifactId>jsonschema2pojo-maven-plugin</artifactId>
@@ -56,6 +55,11 @@
                     <includeJsr305Annotations>false</includeJsr305Annotations>
                     <includeJsr303Annotations>false</includeJsr303Annotations>
                     <annotationStyle>none</annotationStyle>
+                    <excludes>
+                        <exclude>
+                        .gitignore
+                        </exclude>
+                    </excludes>
                 </configuration>
                 <executions>
                     <execution>
@@ -68,4 +72,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>