Commit 647d3fee authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '15-use-osl-component-images-from-gitlab-image-registry' into 'develop' 

Resolve "Use OSL component images from Gitlab image registry"

See merge request !23
parents cac2fc4d 705c3f13

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: org.etsi.osl.portal.api:latest

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

    environment:

      SPRING_APPLICATION_JSON: '{

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

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

        dockerfile: Dockerfile        

    image: org.etsi.osl.mano:latest

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

    environment:

       SPRING_APPLICATION_JSON: '{

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

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

        dockerfile: Dockerfile        

    image: org.etsi.osl.bugzilla:latest

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

    environment:

      SPRING_APPLICATION_JSON: '{

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

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

        dockerfile: Dockerfile      

    image: org.etsi.osl.tmf.api:latest

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

    environment:

      SPRING_APPLICATION_JSON: '{

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

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

        dockerfile: Dockerfile      

    image: org.etsi.osl.osom:latest

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

    environment:

      SPRING_APPLICATION_JSON: '{

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

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

        dockerfile: Dockerfile      

    image: org.etsi.osl.oas:latest

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

    environment:

      SPRING_APPLICATION_JSON: '{

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

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

        dockerfile: Dockerfile      

    image: org.etsi.osl.cridge:latest

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

    environment:

      SPRING_APPLICATION_JSON: '{

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

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

        dockerfile: Dockerfile        

    image: org.etsi.osl.centrallog.service:latest

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

    environment:

      SPRING_APPLICATION_JSON: '{

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

kubernetes/helm/openslice/values.yaml

+18 −18
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ image: 
    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

  bugzilla:

    repository: openslice/org.etsi.osl.bugzilla

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

    tag: "develop"

  centrallog:

    repository: openslice/org.etsi.osl.centrallog.service

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

    tag: "develop"

  keycloak:

    repository: jboss/keycloak

    pullPolicy: IfNotPresent
@@ -36,45 +36,45 @@ image: 
    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

  manoclient:

    repository: openslice/org.etsi.osl.mano

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

    tag: "develop"

  osom:

    repository: openslice/org.etsi.osl.osom

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

    tag: "develop"

  portalapi:

    repository: openslice/org.etsi.osl.portal.api

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

    tag: "develop"

  osscapi:

    repository: openslice/org.etsi.osl.tmf.api

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

    tag: "develop"

  mysql:

    repository: mysql

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "5.7.43"

  oasapi:

    repository: openslice/org.etsi.osl.oas

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

    tag: "develop"

  portalweb:

    repository: openslice/org.etsi.osl.portal.web

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

    tag: "develop"

  tmfweb:

    repository: openslice/org.etsi.osl.tmf.web

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web

    pullPolicy: IfNotPresent

    # Overrides the image tag whose default is the chart appVersion.

    tag: "latest"

    tag: "develop"



bugzillaurl: example.com:443/bugzilla

bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z

kubernetes/template/bugzilla.yaml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ spec: 
                  "bugzillakey":"", 

                  "main_operations_product":"" 

                }

          image: openslice/org.etsi.osl.bugzilla:latest

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

          name: bugzilla

          ports:

            - containerPort: 13010

kubernetes/template/centrallog.yaml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ spec: 
                  "spring.activemq.password": "artemis", 

                  "centrallogurl":"http://elk_ip:elk_port/index_name/_doc" 

                }

          image: openslice/org.etsi.osl.centrallog.service:latest

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

          name: centrallog

          ports:

            - containerPort: 13013

kubernetes/template/manoclient.yaml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ spec: 
                  "spring.activemq.password": "artemis",

                  "logging.level.org.springframework" : "INFO"

                }

          image: openslice/org.etsi.osl.mano:latest

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

          name: manoclient

          ports:

            - containerPort: 13011