Commit 0eeb531c authored by Noel Alonso's avatar Noel Alonso
Browse files

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

parents dfb23002 a2510850

.gitlab-ci.yml

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ deploy-dev: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: api

    SERVICES_TO_CHECK: api_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 300

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -156,6 +157,7 @@ deploy-supporting-branch: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: api

    SERVICES_TO_CHECK: api_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 300

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -194,6 +196,7 @@ deploy-pro: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: api

    SERVICES_TO_CHECK: api_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 300

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

deploy/docker-compose.dev.yml

+0 −24
Original line number Diff line number Diff line 
version: '3.5'



services:

  tasks:

    ports:

      - target: ${MICROSERVICE_PORT}

        published: ${MICROSERVICE_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/api/${MICROSERVICE_NAME}

        traefik.backend: ${MICROSERVICE_NAME}

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M



volumes:

  mediastorage-private-vol:

    name: mediastorage-private-vol

deploy/docker-compose.prod.yml

+0 −16
Original line number Diff line number Diff line
@@ -3,25 +3,9 @@ version: '3.5' 
services:

  tasks:

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/api/${MICROSERVICE_NAME}

        traefik.backend: ${MICROSERVICE_NAME}

      placement:

        constraints:

          - node.role == worker

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M



volumes:

  mediastorage-private-vol:

deploy/docker-compose.tmpl.yml

+18 −1
Original line number Diff line number Diff line
@@ -29,7 +29,24 @@ services: 
      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 4m

      start_period: 5m

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${MICROSERVICE_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/api/${MICROSERVICE_NAME}

        traefik.backend: ${MICROSERVICE_NAME}

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M



networks:

  elastic-net: