Commit 97fc9e09 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/server/vessels into dev

parents 986c5008 a843e04b

.gitlab-ci.yml

+6 −0
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ deploy-commands-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STATUS_CHECK_DELAY: 120

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-commands

    SERVICE: ${CI_PROJECT_NAME}-commands

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}
@@ -292,6 +295,9 @@ deploy-view-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STATUS_CHECK_DELAY: 120

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-view

    SERVICE: ${CI_PROJECT_NAME}-view

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

docker-compose.vessels-commands.prod.yml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ services: 
          - node.role == worker

      restart_policy:

        condition: on-failure

        max_attempts: 3

        delay: 1m

        window: 3m



networks:

  traefik-net:

docker-compose.vessels-view.prod.yml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ services: 
          - node.role == worker

      restart_policy:

        condition: on-failure

        max_attempts: 3

        delay: 1m

        window: 3m



networks:

  traefik-net: