Rewriting omoponfhir main build

omoponfhir · Jul 12, 2019 · 4c9875f · 4c9875f
1 parent 6f9be01
commit 4c9875f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 163 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "omoponfhir-omopv5-jpabase"]
+	path = omoponfhir-omopv5-jpabase
+	url = https://github.com/omoponfhir/omoponfhir-omopv5-jpabase.git
+	branch = master
+[submodule "omoponfhir-omopv5-stu3-mapping"]
+	path = omoponfhir-omopv5-stu3-mapping
+	url = https://github.com/omoponfhir/omoponfhir-omopv5-stu3-mapping.git
+	branch = master
+[submodule "omoponfhir-stu3-server"]
+	path = omoponfhir-stu3-server
+	url = https://github.com/omoponfhir/omoponfhir-stu3-server.git
+	branch = master
diff --git a/Dockerfile b/Dockerfile
@@ -2,14 +2,7 @@
 FROM maven:3.6.1-alpine as builder
 COPY . /usr/src/app
 WORKDIR /usr/src/app
-RUN apk update && apk upgrade && \
-    apk add --no-cache bash git openssh
-
-RUN git clone https://github.com/omoponfhir/omoponfhir-omopv5-jpabase.git
-RUN git clone https://github.com/omoponfhir/omoponfhir-omopv5-stu3-mapping.git
-RUN git clone https://github.com/omoponfhir/omoponfhir-stu3-server.git
-
-RUN mvn -f pom-docker.xml clean install
+RUN mvn clean install
 
 #Build the Tomcat container
 FROM tomcat:alpine

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline{
             //line between the ''' characters will be treated as separate lines of a shell script.
 
             steps{
-                sh '''mvn -f pom-docker-test.xml test'''
+                sh '''mvn test'''
             }
         }
 

diff --git a/omoponfhir-omopv5-jpabase b/omoponfhir-omopv5-jpabase
diff --git a/omoponfhir-omopv5-stu3-mapping b/omoponfhir-omopv5-stu3-mapping
diff --git a/omoponfhir-stu3-server b/omoponfhir-stu3-server
diff --git a/pom-docker-test.xml b/pom-docker-test.xml
diff --git a/pom-docker.xml b/pom-docker.xml