Commit 31152a01 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'main' into develop

parents a6465293 f6537672

compose/docker-compose.yaml.configure

+8 −8
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.portal.api/

        dockerfile: Dockerfile        

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "origins": "http://localhost",
@@ -134,7 +134,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.mano/

        dockerfile: Dockerfile        

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:latest

    environment:

       SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -160,7 +160,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.bugzilla/

        dockerfile: Dockerfile        

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -186,7 +186,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.tmf.api/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "origins": "http://localhost",
@@ -233,7 +233,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.osom/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1",
@@ -259,7 +259,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.oas/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "origins": "http://localhost",
@@ -301,7 +301,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.cridge/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -345,7 +345,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.centrallog.service/

        dockerfile: Dockerfile        

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",