From 01378df7dd49c884c5bbe41d08ac5385063d0004 Mon Sep 17 00:00:00 2001 From: Christos Tranoris <tranoris@ece.upatras.gr> Date: Wed, 8 Nov 2023 15:40:32 +0200 Subject: [PATCH] fix for #1. remove api gateway module and added cridge --- compose/deploy.sh | 2 +- compose/docker-compose.yaml.configure | 24 ++++++++++++++++++++++++ pom.xml | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/compose/deploy.sh b/compose/deploy.sh index 3654912..04ef966 100644 --- a/compose/deploy.sh +++ b/compose/deploy.sh @@ -30,7 +30,6 @@ updaterepo org.etsi.osl.centrallog.client updaterepo org.etsi.osl.centrallog.service updaterepo org.etsi.osl.model updaterepo org.etsi.osl.portal.api -updaterepo org.etsi.osl.gateway.api updaterepo org.etsi.osl.mano updaterepo org.etsi.osl.bugzilla updaterepo org.etsi.osl.osom @@ -38,6 +37,7 @@ updaterepo org.etsi.osl.oas updaterepo org.etsi.osl.portal.web updaterepo org.etsi.osl.tmf.api updaterepo org.etsi.osl.tmf.web +updaterepo org.etsi.osl.cridge cd $dirlocation docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven/org.etsi.osl.main maven:3.9.3-ibm-semeru-17-focal mvn clean verify -DskipTests diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure index 60f7a76..80e1d79 100644 --- a/compose/docker-compose.yaml.configure +++ b/compose/docker-compose.yaml.configure @@ -276,6 +276,30 @@ services: - front - back + cridge: + container_name: openslice-cridge + restart: always + profiles: [ "prod"] + build: + context: ../../org.etsi.osl.cridge/ + dockerfile: Dockerfile.cridge + image: org.etsi.osl.cridge:latest + environment: + SPRING_APPLICATION_JSON: '{ + "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", + "spring.activemq.user": "artemis", + "spring.activemq.password": "artemis", + "logging.level.org.springframework" : "INFO", + "org.etsi.osl.cridge" : "DEBUG" + }' + networks: + - front + - back + volumes: + - ./kubedir/:/root/.kube + depends_on: + - osscapi + portainer: diff --git a/pom.xml b/pom.xml index cf4ea92..43ec0ce 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,7 @@ <module>../org.etsi.osl.bugzilla</module> <module>../org.etsi.osl.centrallog.service</module> <module>../org.etsi.osl.osom</module> + <module>../org.etsi.osl.cridge</module> </modules> -- GitLab