Merge branch 'DEVELOP_BE' of ssh://172.18.22.160:29418/Dropwizard/Microservices/mics-home-service into DEVELOP_BE
diff --git a/Dockerfile b/Dockerfile
index 71ae7cf..8c20776 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,40 +3,57 @@
MAINTAINER Dimitris
WORKDIR /
+### PORTAL ####
+WORKDIR portal
+RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/oK/Portal/Backend.git && cd Backend && git checkout DEVELOP_BE
-
-### HOME SERVICE ####
-WORKDIR microservices
-RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/Dropwizard/Microservices/mics-home-service.git && cd mics-home-service && git checkout DEVELOP_BE
-
-WORKDIR mics-home-service
-
-RUN rm -f -r ./target/mics-home-service && rm -f -r ./target/mics-home-service.war
-
-
+WORKDIR Backend
+RUN rm -f -r ./target/portal && rm -f -r ./target/portal.war
RUN mvn install -DskipTests
-
-RUN mv ./target/mics-home-service.war /opt/tomcat/webapps/mics-home-service.war
+RUN mv ./target/portal.war /opt/tomcat/webapps/portal.war
WORKDIR /
+### PORTAL FE ####
+WORKDIR portal
+RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/oK/Portal/Frontend.git && cd Frontend && git checkout DEVELOP_FE
+WORKDIR Frontend
+RUN npm install
+RUN ng build --prod
+RUN mv ./dist/ /opt/tomcat/webapps/Frontend/
+
+WORKDIR /
+### PLGM FRONTEND ####
+WORKDIR gridmeasures
+RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/oK/PlannedGridMeasures/Frontend.git && cd Frontend && git checkout DEVELOP_FE
+
+WORKDIR Frontend
+RUN npm install
+RUN ng build --prod
+RUN mv ./dist/ /opt/tomcat/webapps/GridMeasuresFrontend/
+
+WORKDIR /
### DIAGNOSIS APP ####
WORKDIR microservices
-# use this lnik if no proxy(WLAN) - http://87.128.212.254:8880/gitblit-1.8.0/r/Dropwizard/Microservices/mics-diagnosis-app.git
RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/Dropwizard/Microservices/mics-diagnosis-app.git && cd mics-diagnosis-app && git checkout DEVELOP_FE
WORKDIR mics-diagnosis-app
-
-RUN npm install -g @angular/cli@1.6.1
RUN npm install
RUN ng build --prod
-
RUN mv ./dist/ /opt/tomcat/webapps/mics-diagnosis-app/
WORKDIR /
+### HOME SERVICE ####
+WORKDIR microservices
+ARG CACHEBUST=1
+RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/Dropwizard/Microservices/mics-home-service.git && cd mics-home-service && git checkout DEVELOP_BE
-### ADD PARAMETER TO TOMCAT CONTEXT ###
-RUN sed -i '/<\/Context>/i <Parameter name="OK_MICS_HOME_ENVIRONMENT" override="false" value="Docker"/>' /opt/tomcat/conf/context.xml
+WORKDIR mics-home-service
+RUN rm -f -r ./target/mics-home-service && rm -f -r ./target/mics-home-service.war
+RUN mvn install -DskipTests
+RUN mv ./target/mics-home-service.war /opt/tomcat/webapps/mics-home-service.war
+
+WORKDIR /
CMD ["/opt/tomcat/bin/catalina.sh", "run"]
diff --git a/Jenkinsfile b/Jenkinsfile
index 652f422..25f75ce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@
stage('Build image') {
/* This builds the actual image; synonymous to
* docker build on the command line */
- sh 'docker build --no-cache -t myserver_home:jenkinsversion .'
+ sh 'docker build --rm -t myserver_home:jenkinsversion .'
}
stage('Refresh containers') {
