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 @@
1.0-SNAPSHOT
jar
-
- ${project.groupId}
- core
- ${project.version}
-
+
+
+ ${project.groupId}
+ core
+ ${project.version}
+
org.springframework.shell
spring-shell-starter
@@ -71,7 +72,7 @@
${project.basedir}/../resources
- true
+ true
@@ -87,7 +88,27 @@
false
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.2.0
+
+
+ copy-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/alternateLocation
+ false
+ true
+ true
+
+
+
+
-
\ No newline at end of file
+
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 @@
-
org.jsonschema2pojo
jsonschema2pojo-maven-plugin
@@ -56,6 +55,11 @@
false
false
none
+
+
+ .gitignore
+
+
@@ -68,4 +72,4 @@
-
\ No newline at end of file
+