Commit 6b37eb5e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Limita recursos y actualiza dev a Swarm

parent 172b6262

.gitlab-ci.yml

+8 −8
Original line number Diff line number Diff line
@@ -66,21 +66,21 @@ container-scanning: 


deploy-development:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    PUBLIC_HOSTNAME: https://${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://${DEV_PUBLIC_HOSTNAME}
@@ -92,21 +92,21 @@ deploy-development: 


deploy-stable:

  stage: deploy

  image: redmic/docker-gitlab

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: ${CI_PROJECT_NAME}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    PUBLIC_HOSTNAME: https://${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://${DEV_PUBLIC_HOSTNAME}

docker-compose.dev.yml

+25 −4
Original line number Diff line number Diff line
@@ -2,7 +2,28 @@ version: '3.5' 


services:

 redmic-dev:

    container_name: ${SITE_NAME}

    restart: on-failure:3

    ports:

      - ${SITE_PORT}:${SITE_PORT}
 
      - target: ${SITE_PORT}

        published: ${SITE_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${SITE_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: Host:${PUBLIC_HOSTNAME}

        traefik.backend: ${SITE_NAME}

      placement:

        constraints:

          - node.role == manager

      restart_policy:

        condition: on-failure

        delay: 10s

        window: 30s

      resources:

        limits:

          cpus: '0.1'

          memory: 64M

        reservations:

          memory: 52M

docker-compose.prod.yml

+9 −8
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ version: '3.5' 


services:

 redmic-dev:

    networks:

      - traefik-net

    deploy:

      mode: replicated

      replicas: 1
@@ -14,11 +12,14 @@ services: 
        traefik.backend: ${SITE_NAME}

      placement:

        constraints:

          - node.role == worker

          - node.role == manager

      restart_policy:

        condition: on-failure

        max_attempts: 3



networks:

  traefik-net:

    external: true
 
        delay: 10s

        window: 30s

      resources:

        limits:

          cpus: '0.1'

          memory: 64M

        reservations:

          memory: 52M

docker-compose.tmpl.yml

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ services: 
    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    networks:

      - redmic-net

      - traefik-net

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${SITE_PORT}

      interval: 30s
@@ -15,3 +16,5 @@ services: 
networks:

  redmic-net:

    external: true

  traefik-net:

    external: true