Commit c534badb authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '14-docker-compose-yaml-configure-is-referencing-old-dockerfiles-for-building' into 'develop'

Resolve "docker-compose.yaml.configure is referencing old Dockerfiles for building"

See merge request !22
parents e5e9f80c 8233dbcf

compose/docker-compose.yaml.configure

+8 −8
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ services: 
    profiles: ["prod"]

    build:

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

        dockerfile: Dockerfile.portalapi        

        dockerfile: Dockerfile        

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

    environment:

      SPRING_APPLICATION_JSON: '{
@@ -132,7 +132,7 @@ services: 
    profiles: ["prod"]

    build:

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

        dockerfile: Dockerfile.mano        

        dockerfile: Dockerfile        

    image: org.etsi.osl.mano:latest

    environment:

       SPRING_APPLICATION_JSON: '{
@@ -158,7 +158,7 @@ services: 
    profiles: ["prod"]

    build:

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

        dockerfile: Dockerfile.bugzilla        

        dockerfile: Dockerfile        

    image: org.etsi.osl.bugzilla:latest

    environment:

      SPRING_APPLICATION_JSON: '{
@@ -184,7 +184,7 @@ services: 
    profiles: ["prod"]

    build:

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

        dockerfile: Dockerfile.tmfapi      

        dockerfile: Dockerfile      

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

    environment:

      SPRING_APPLICATION_JSON: '{
@@ -225,7 +225,7 @@ services: 
    profiles: ["prod"]

    build:

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

        dockerfile: Dockerfile.osom      

        dockerfile: Dockerfile      

    image: org.etsi.osl.osom:latest

    environment:

      SPRING_APPLICATION_JSON: '{
@@ -251,7 +251,7 @@ services: 
    profiles: ["prod"]

    build:

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

        dockerfile: Dockerfile.oasapi      

        dockerfile: Dockerfile      

    image: org.etsi.osl.oas:latest

    environment:

      SPRING_APPLICATION_JSON: '{
@@ -288,7 +288,7 @@ services: 
    profiles: [ "prod"]

    build:

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

        dockerfile: Dockerfile.cridge      

        dockerfile: Dockerfile      

    image: org.etsi.osl.cridge:latest

    environment:

      SPRING_APPLICATION_JSON: '{
@@ -327,7 +327,7 @@ services: 
    profiles: ["prod"]

    build:

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

        dockerfile: Dockerfile.centrallog        

        dockerfile: Dockerfile        

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

    environment:

      SPRING_APPLICATION_JSON: '{