Skip to content
Snippets Groups Projects
Commit b2c50d7d authored by trantzas's avatar trantzas
Browse files

Merge "main" into develop

parent 31152a01
No related branches found
No related tags found
1 merge request!46MR for Release 2024Q4
Pipeline #7656 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
compose/docker-compose.yaml.configure
+ 8
− 8
View file @ b2c50d7d
...@@ -86,7 +86,7 @@ services: ...@@ -86,7 +86,7 @@ services:
build: build:
context: ../../org.etsi.osl.portal.api/ context: ../../org.etsi.osl.portal.api/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"origins": "http://localhost", "origins": "http://localhost",
...@@ -134,7 +134,7 @@ services: ...@@ -134,7 +134,7 @@ services:
build: build:
context: ../../org.etsi.osl.mano/ context: ../../org.etsi.osl.mano/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
...@@ -160,7 +160,7 @@ services: ...@@ -160,7 +160,7 @@ services:
build: build:
context: ../../org.etsi.osl.bugzilla/ context: ../../org.etsi.osl.bugzilla/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
...@@ -186,7 +186,7 @@ services: ...@@ -186,7 +186,7 @@ services:
build: build:
context: ../../org.etsi.osl.tmf.api/ context: ../../org.etsi.osl.tmf.api/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"origins": "http://localhost", "origins": "http://localhost",
...@@ -233,7 +233,7 @@ services: ...@@ -233,7 +233,7 @@ services:
build: build:
context: ../../org.etsi.osl.osom/ context: ../../org.etsi.osl.osom/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1", "spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1",
...@@ -259,7 +259,7 @@ services: ...@@ -259,7 +259,7 @@ services:
build: build:
context: ../../org.etsi.osl.oas/ context: ../../org.etsi.osl.oas/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"origins": "http://localhost", "origins": "http://localhost",
...@@ -301,7 +301,7 @@ services: ...@@ -301,7 +301,7 @@ services:
build: build:
context: ../../org.etsi.osl.cridge/ context: ../../org.etsi.osl.cridge/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
...@@ -345,7 +345,7 @@ services: ...@@ -345,7 +345,7 @@ services:
build: build:
context: ../../org.etsi.osl.centrallog.service/ context: ../../org.etsi.osl.centrallog.service/
dockerfile: Dockerfile dockerfile: Dockerfile
image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:latest image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop
environment: environment:
SPRING_APPLICATION_JSON: '{ SPRING_APPLICATION_JSON: '{
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false", "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment