docker compose for usage of mongodb & Login module using mongodb

This commit is contained in:
Nicolas Héron 2020-01-03 19:04:41 +01:00
commit b1d5f53a79
13 changed files with 35 additions and 11 deletions

View file

@ -19,6 +19,8 @@ services:
hostname: kie-wb.pymma hostname: kie-wb.pymma
links: links:
- businessProxyDB:mongodb - businessProxyDB:mongodb
depends_on:
- businessProxyDB
networks: networks:
drools-network-dev: drools-network-dev:
ipv4_address: 172.27.1.5 ipv4_address: 172.27.1.5
@ -39,6 +41,7 @@ services:
ports: ports:
- 8200:8200 - 8200:8200
links: links:
- kie-wb:kie-wb
- businessProxyDB:mongodb - businessProxyDB:mongodb
depends_on: depends_on:
- businessProxyDB - businessProxyDB

View file

@ -1,7 +1,8 @@
spring.data.mongodb.database=businessProxyDB spring.data.mongodb.database=businessProxyDB
spring.data.mongodb.host=mongodb:27017 spring.data.mongodb.host=mongodb:27017
kie-wb.mainwbintern=http://kie-wb:8080/kie-wb
kie-wb.mainwbextern=http://kie-wb:8080/kie-wb
server.port=${port:8200} server.port=${port:8200}
kie-wb.baseurl=http://kie-wb:8080/kie-wb/rest kie-wb.baseurl=http://kie-wb:8080/kie-wb/rest
kie-wb.username=admin kie-wb.username=admin

View file

@ -5,6 +5,7 @@ import org.chtijbug.drools.console.service.model.gitlab.GroupElementResponse;
import org.chtijbug.drools.console.service.model.gitlab.ProjectMoveResponse; import org.chtijbug.drools.console.service.model.gitlab.ProjectMoveResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.DependsOn;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -18,6 +19,7 @@ import java.util.List;
import java.util.Scanner; import java.util.Scanner;
@Service @Service
@DependsOn("applicationContext")
public class GitLabRepositoryService { public class GitLabRepositoryService {

View file

@ -1,6 +1,7 @@
package org.chtijbug.drools.console.service; package org.chtijbug.drools.console.service;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -9,6 +10,7 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@Service @Service
@DependsOn("applicationContext")
public class GitRepositoryService { public class GitRepositoryService {
public static void main(String[] args) { public static void main(String[] args) {

View file

@ -8,6 +8,7 @@ import org.drools.workbench.models.datamodel.rule.InterpolationVariable;
import org.drools.workbench.models.guided.template.backend.RuleTemplateModelXMLPersistenceImpl; import org.drools.workbench.models.guided.template.backend.RuleTemplateModelXMLPersistenceImpl;
import org.drools.workbench.models.guided.template.shared.TemplateModel; import org.drools.workbench.models.guided.template.shared.TemplateModel;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.*; import java.io.*;
@ -17,6 +18,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@Service @Service
@DependsOn("applicationContext")
public class GuidedRuleTemplateExcelService { public class GuidedRuleTemplateExcelService {
@Value("${adminConsole.tmpdir}") @Value("${adminConsole.tmpdir}")

View file

@ -4,12 +4,14 @@ package org.chtijbug.drools.console.service;
import org.chtijbug.drools.proxy.persistence.repository.BusinessTransactionActionRepository; import org.chtijbug.drools.proxy.persistence.repository.BusinessTransactionActionRepository;
import org.chtijbug.drools.proxy.persistence.repository.BusinessTransactionPersistenceRepository; import org.chtijbug.drools.proxy.persistence.repository.BusinessTransactionPersistenceRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
@Service @Service
@DependsOn("applicationContext")
public class IndexerService { public class IndexerService {

View file

@ -8,6 +8,7 @@ import org.apache.commons.io.IOUtils;
import org.chtijbug.drools.console.service.model.gitlab.GitLabConfigurationData; import org.chtijbug.drools.console.service.model.gitlab.GitLabConfigurationData;
import org.chtijbug.drools.console.service.model.jenkins.JenkinsConfigurationData; import org.chtijbug.drools.console.service.model.jenkins.JenkinsConfigurationData;
import org.chtijbug.drools.console.service.util.AppContext; import org.chtijbug.drools.console.service.util.AppContext;
import org.springframework.context.annotation.DependsOn;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -18,6 +19,7 @@ import java.net.URISyntaxException;
import java.util.Map; import java.util.Map;
@Service @Service
@DependsOn("applicationContext")
public class JenkinsService { public class JenkinsService {
JenkinsServer jenkins = null; JenkinsServer jenkins = null;

View file

@ -16,6 +16,7 @@ import org.drools.workbench.models.guided.template.shared.TemplateModel;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.DependsOn;
import org.springframework.http.*; import org.springframework.http.*;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.client.RequestCallback; import org.springframework.web.client.RequestCallback;
@ -25,6 +26,7 @@ import java.nio.charset.Charset;
import java.util.*; import java.util.*;
@Service @Service
@DependsOn("applicationContext")
public class KieRepositoryService { public class KieRepositoryService {

View file

@ -18,6 +18,7 @@ import org.chtijbug.drools.proxy.persistence.repository.ProjectRepository;
import org.chtijbug.drools.proxy.persistence.repository.RuntimeRepository; import org.chtijbug.drools.proxy.persistence.repository.RuntimeRepository;
import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse; import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
@ -25,6 +26,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
@Service @Service
@DependsOn("applicationContext")
public class ProjectPersistService { public class ProjectPersistService {
public static String PROJECT = "4"; public static String PROJECT = "4";

View file

@ -7,6 +7,7 @@ import org.kie.server.api.model.KieServerInfo;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.DependsOn;
import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@ -16,6 +17,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@Service @Service
@DependsOn("applicationContext")
public class RuntimeService { public class RuntimeService {

View file

@ -2,9 +2,11 @@ package org.chtijbug.drools.console.service;
import com.vaadin.flow.server.VaadinSession; import com.vaadin.flow.server.VaadinSession;
import org.chtijbug.drools.console.service.model.UserConnected; import org.chtijbug.drools.console.service.model.UserConnected;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
@DependsOn("applicationContext")
public class UserConnectedService { public class UserConnectedService {
public static String USER = "1"; public static String USER = "1";

View file

@ -27,10 +27,13 @@ ENV JAVA_OPTS -Xms256m -Xmx4512m
##com.pymmasoftware.kie-realm ##com.pymmasoftware.kie-realm
RUN mkdir /opt/jboss/wildfly/modules/com RUN mkdir /opt/jboss/wildfly/modules/com
RUN mkdir /opt/jboss/wildfly/modules/com/pymmasoftware RUN mkdir /opt/jboss/wildfly/modules/com/pymmasoftware
RUN mkdir /opt/jboss/wildfly/modules/com/pymmasoftware/loginmodule RUN mkdir /opt/jboss/wildfly/modules/com/pymmasoftware/pymma-kie-loginmodule
RUN mkdir /opt/jboss/wildfly/modules/com/pymmasoftware/loginmodule/main RUN mkdir /opt/jboss/wildfly/modules/com/pymmasoftware/pymma-kie-loginmodule/main
ADD maven/pymma-kie-login-module.jar /opt/jboss/wildfly/modules/com/pymmasoftware/loginmodule/main/pymma-kie-login-module.jar ADD maven/pymma-kie-login-module.jar /opt/jboss/wildfly/modules/com/pymmasoftware/pymma-kie-loginmodule/main/pymma-kie-loginmodule.jar
ADD etc/module-loginmodule.xml /opt/jboss/wildfly/modules/com/pymmasoftware/loginmodule/main/module.xml ADD maven/mongodb-driver.jar /opt/jboss/wildfly/modules/com/pymmasoftware/pymma-kie-loginmodule/main/mongodb-driver.jar
ADD maven/mongodb-driver-core.jar /opt/jboss/wildfly/modules/com/pymmasoftware/pymma-kie-loginmodule/main/mongodb-driver-core.jar
ADD maven/bson.jar /opt/jboss/wildfly/modules/com/pymmasoftware/pymma-kie-loginmodule/main/bson.jar
ADD etc/module-loginmodule.xml /opt/jboss/wildfly/modules/com/pymmasoftware/pymma-kie-loginmodule/main/module.xml
@ -62,14 +65,12 @@ EXPOSE 8001
####### Drools Workbench CUSTOM CONFIGURATION ############ ####### Drools Workbench CUSTOM CONFIGURATION ############
ADD etc/standalone-full-drools.xml $JBOSS_HOME/standalone/configuration/standalone-full-drools.xml ADD etc/standalone-full-drools.xml $JBOSS_HOME/standalone/configuration/standalone-full-drools.xml
ADD etc/application-users.properties $JBOSS_HOME/standalone/configuration/application-users.properties #ADD etc/application-users.properties $JBOSS_HOME/standalone/configuration/application-users.properties
ADD etc/application-roles.properties $JBOSS_HOME/standalone/configuration/application-roles.properties #ADD etc/application-roles.properties $JBOSS_HOME/standalone/configuration/application-roles.properties
# Added files are chowned to root user, change it to the jboss one. # Added files are chowned to root user, change it to the jboss one.
USER root USER root
RUN chown jboss:jboss $JBOSS_HOME/standalone/configuration/standalone-full-drools.xml && \ RUN chown jboss:jboss $JBOSS_HOME/standalone/configuration/standalone-full-drools.xml
chown jboss:jboss $JBOSS_HOME/standalone/configuration/application-users.properties && \
chown jboss:jboss $JBOSS_HOME/standalone/configuration/application-roles.properties
# Switchback to jboss user # Switchback to jboss user
USER root USER root

View file

@ -3,7 +3,8 @@
# Start Wildfly with the given arguments. # Start Wildfly with the given arguments.
echo "Running Drools Workbench on JBoss Wildfly..." echo "Running Drools Workbench on JBoss Wildfly..."
#export JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=50505,suspend=y,server=y" #export JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=50505,suspend=y,server=y"
exec ./standalone.sh -b $JBOSS_BIND_ADDRESS -c $KIE_SERVER_PROFILE.xml -Djava.net.preferIPv4Stack=true -Dorg.uberfire.metadata.index.dir=/home/lucene -Dorg.uberfire.nio.git.daemon.host=0.0.0.0 -Dorg.uberfire.nio.git.ssh.host=0.0.0.0 -Dorg.guvnor.m2repo.dir=/m2_kiewb/repository -DM2_HOME=/m2_kiewb/repository -Dorg.uberfire.nio.git.dir=/home/niodir -Dorg.uberfire.nio.git.dirname=gitBase -Dorg.appformer.m2repo.url=http://localhost:8080/kie-wb/maven2 -Dkie.maven.settings.custom=/m2_kiewb/settings.xml -Dfile.encoding=UTF-8 -Duser.language=fr -Duser.country=FR export JAVA_OPTS=" -Djava.net.preferIPv4Stack=true -Dorg.uberfire.metadata.index.dir=/home/lucene -Dorg.uberfire.nio.git.daemon.host=0.0.0.0 -Dorg.uberfire.nio.git.ssh.host=0.0.0.0 -Dorg.guvnor.m2repo.dir=/m2_kiewb/repository -DM2_HOME=/m2_kiewb/repository -Dorg.uberfire.nio.git.dir=/home/niodir -Dorg.uberfire.nio.git.dirname=gitBase -Dorg.appformer.m2repo.url=http://localhost:8080/kie-wb/maven2 -Dkie.maven.settings.custom=/m2_kiewb/settings.xml -Dfile.encoding=UTF-8 -Duser.language=fr -Duser.country=FR -Dorg.uberfire.ext.security.management.api.userManagementServices=PymmaKieSecurityService "
exec ./standalone.sh -b $JBOSS_BIND_ADDRESS -c $KIE_SERVER_PROFILE.xml
exit $? exit $?