Commit 69ebab59 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza definición de imagen, limpia y añade red

parent b94cbb0d

build/Dockerfile

+8 −8
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server

ARG PARENT_IMAGE_TAG=latest

ARG PARENT_IMAGE_NAME \

    PARENT_IMAGE_TAG



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}



COPY /dist/*.jar ./



ARG MICROSERVICE_NAME=ais

ENV MICROSERVICE_NAME=${MICROSERVICE_NAME}

ARG MICROSERVICE_NAME \

    MICROSERVICE_PORT



ARG MICROSERVICE_PORT=8090

ENV MICROSERVICE_PORT=${MICROSERVICE_PORT}

ENV MICROSERVICE_NAME=${MICROSERVICE_NAME} \

    MICROSERVICE_PORT=${MICROSERVICE_PORT}



EXPOSE ${MICROSERVICE_PORT}



COPY /dist/*.jar ./

deploy/compose.tmpl.yaml

+10 −6
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@ services: 
  ais:

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/server/ais}:${IMAGE_TAG:-latest}

    environment:

      MICROSERVICE_NAME:

      MICROSERVICE_PORT:

      AISHUB_SERVICE_USERNAME:

      APP_SCHEDULING_ENABLE:

      JAVA_OPTS:

    networks:

      kafka-net:

      redmic-net:

      kafka-net:

      metric-net:

    healthcheck:

      test: wget --spider -q http://localhost:${MICROSERVICE_PORT}/api/${MICROSERVICE_NAME}/actuator/health

      interval: ${HEALTHCHECK_INTERVAL:-30s}
@@ -25,12 +24,17 @@ services: 
        delay: ${UPDATE_DELAY:-2m}



networks:

  redmic-net:

    name: ${REDMIC_NET_NAME:-redmic-net}

    driver: ${REDMIC_NET_DRIVER:-overlay}

    external: true



  kafka-net:

    name: ${KAFKA_NET_NAME:-kafka-net}

    driver: ${KAFKA_NET_DRIVER:-overlay}

    external: true



  redmic-net:

    name: ${REDMIC_NET_NAME:-redmic-net}

    driver: ${REDMIC_NET_DRIVER:-overlay}

  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    driver: ${METRIC_NET_DRIVER:-overlay}

    external: true