Dockerfile adjusted
diff --git a/Dockerfile b/Dockerfile
index d68cbb7..88a5955 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat:8.0
+FROM 8.5.66-jdk11-adoptopenjdk-openj9
MAINTAINER dimitrios.chalepakis@pta.de
COPY deploy/conf/context.xml /usr/local/tomcat/conf/context.xml
diff --git a/Jenkinsfile b/Jenkinsfile
index bc7c73e..5208457 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,20 +1,24 @@
pipeline {
agent any
stages {
+ stage('AuthAndAuth') {
+ steps {
+ dir("AuthAndAuth") {
+ git branch: 'master', url: 'https://git.eclipse.org/r/openk-coremodules/org.eclipse.openk-coremodules.authandauth.git'
+ sh 'mvn clean package'
+ sh 'mkdir webapps || true'
+ sh 'cp target/portal.war webapps/'
+ }
+ }
+ }
stage('portalFE') {
steps {
dir("portalFE") {
git branch: 'master', url: 'https://git.eclipse.org/r/openk-coremodules/org.eclipse.openk-coremodules.portalFE.git'
sh 'npm install'
- sh 'npm run build'
- }
- }
- }
- stage('Backend') {
- steps {
- dir("AuthAndAuth") {
- git branch: 'master', url: 'https://git.eclipse.org/r/openk-coremodules/org.eclipse.openk-coremodules.authandauth.git'
- sh 'mvn clean package'
+ sh 'npm run build'
+ sh 'mkdir ../AuthAndAuth/webapps/portalFE || true'
+ sh 'cp -r dist/* ../AuthAndAuth/webapps/portalFE/'
}
}
}
@@ -26,6 +30,7 @@
sh 'docker rmi portal:MASTER || true'
sh 'docker build -f Dockerfile -t portal:MASTER --no-cache .'
sh "docker run -d --name portal_container -p 8888:8080 --restart always portal:MASTER"
+ sh 'rm -rf webapps || true'
}
}
}
