Merge branch 'DEVELOP_BE' of ssh://172.18.22.160:29418/Dropwizard/Microservices/mics-central-service into DEVELOP_BE
diff --git a/Dockerfile b/Dockerfile
index 639b5da..c9ab737 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
WORKDIR /
-COPY C:\Users\Administrator\Projekt\Microservices\UbuntuServer\central\my_wrapper_script.sh my_wrapper_script.sh
+COPY my_wrapper_script.sh my_wrapper_script.sh
RUN sed -i -e 's/\r$//' my_wrapper_script.sh
CMD ./my_wrapper_script.sh
diff --git a/Jenkinsfile b/Jenkinsfile
index 425f0c8..f5e217a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,4 @@
node {
- def app
stage('Clone repository') {
/* Let's make sure we have the repository cloned to our workspace */
@@ -10,8 +9,7 @@
stage('Build image') {
/* This builds the actual image; synonymous to
* docker build on the command line */
-
- app = docker.build("myserver_central/jenkinsversion --no-cache")
+ sh 'docker build --no-cache -t myserver_central:jenkinsversion .'
}
stage('Refresh containers') {
diff --git a/my_wrapper_script.sh b/my_wrapper_script.sh
new file mode 100644
index 0000000..a60aab6
--- /dev/null
+++ b/my_wrapper_script.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd microservices/mics-central-service/
+java -jar target/mics-central-service.jar server serviceConfigDevLocal_MASTER.yml
\ No newline at end of file
