Commit 7927fcfd authored by Noel Alonso's avatar Noel Alonso
Browse files

Corrige problemas de despliegue

parent 725682fc

.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -105,8 +105,7 @@ variables: 
        -e SPRING_PROFILES_ACTIVE=dev \

        -e SPRING_DATASOURCE_USERNAME \

        -e SPRING_DATASOURCE_PASSWORD \

        ${OAUTH_IMAGE_NAME}:${OAUTH_IMAGE_TAG};

      docker logs -f oauth &> oauth.log &

        ${OAUTH_IMAGE_NAME}:${OAUTH_IMAGE_TAG}

  after_script:

    - rm -rf .m2/repository/es

    - docker stop oauth postgres

deploy/docker-compose.atlas-commands.dev.yml

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ services: 


volumes:

  commands-vol:

    name: ${COMMANDS_VOL_NAME:-'${UNIT_NAME}-commands-{{.Task.Slot}}-vol'}
 
    name: ${COMMANDS_VOL_NAME:-${UNIT_NAME}-commands-{{.Task.Slot}}-vol}

deploy/docker-compose.atlas-commands.prod.yml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ services: 


volumes:

  commands-vol:

    name: ${COMMANDS_VOL_NAME:-'${UNIT_NAME}-commands-{{.Task.Slot}}-vol'}

    name: ${COMMANDS_VOL_NAME:-${UNIT_NAME}-commands-{{.Task.Slot}}-vol}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: shared

deploy/docker-compose.atlas-commands.tmpl.yml

+1 −4
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ services: 
  atlas-commands:

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

    environment:

      UNIT_NAME:

      MICROSERVICE_PATH: commands

      PORT:

      SERVER_PORT: ${PORT}

      OAUTH_CLIENT_ID:

      OAUTH_CLIENT_SECRET:
@@ -21,7 +18,7 @@ services: 
    volumes:

      - commands-vol:/tmp/kafka

    healthcheck:

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

      test: wget --spider -q http://localhost:${PORT}/api/${UNIT_NAME}/commands/actuator/health

      interval: ${ATLAS_COMMANDS_HEALTHCHECK_INTERVAL:-30s}

      timeout: ${ATLAS_COMMANDS_HEALTHCHECK_TIMEOUT:-15s}

      retries: ${ATLAS_COMMANDS_HEALTHCHECK_RETRIES:-10}

deploy/docker-compose.atlas-view.tmpl.yml

+1 −4
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ services: 
  atlas-view:

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

    environment:

      UNIT_NAME:

      MICROSERVICE_PATH: view

      PORT:

      SERVER_PORT: ${PORT}

      OAUTH_CLIENT_ID:

      OAUTH_CLIENT_SECRET:
@@ -23,7 +20,7 @@ services: 
      redmic-net:

      traefik-net:

    healthcheck:

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

      test: wget --spider -q http://localhost:${PORT}/api/${UNIT_NAME}/view/actuator/health

      interval: ${ATLAS_VIEW_HEALTHCHECK_INTERVAL:-30s}

      timeout: ${ATLAS_VIEW_HEALTHCHECK_TIMEOUT:-15s}

      retries: ${ATLAS_VIEW_HEALTHCHECK_RETRIES:-10}