Commit bd3d715c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Transforma deploy de dev a Swarm, corrige detalles

parent 26357e27

.gitlab-ci.yml

+4 −3
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ deploy-dev: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: client

    SERVICES_TO_CHECK: client_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -219,7 +220,8 @@ deploy-supporting-branch: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: client

    SERVICES_TO_CHECK: client_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -276,7 +278,6 @@ deploy-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STATUS_CHECK_DELAY: '60'

    STACK: client

    SERVICES_TO_CHECK: client_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

Dockerfile

+2 −0
Original line number Diff line number Diff line 
FROM node:alpine



LABEL maintainer="info@redmic.es"



ENV DIRPATH /opt/redmic



WORKDIR ${DIRPATH}

.env→deploy/.env

+0 −0

File moved.

View file

deploy/docker-compose.dev.yml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  web:

    ports:

      - target: ${WEB_PORT}

        published: ${WEB_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${WEB_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/

        traefik.backend: web

        traefik.frontend.errors.5xx.status: "500-599"

        traefik.frontend.errors.5xx.backend: static-pages-static-pages-static-pages

        traefik.frontend.errors.5xx.query: '/web-5xx/'

      restart_policy:

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '2'

          memory: 128M

        reservations:

          memory: 103M

docker-compose.prod.yml→deploy/docker-compose.prod.yml

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


services:

  web:

    networks:

      - traefik-net

    deploy:

      mode: replicated

      replicas: 1
@@ -19,16 +17,11 @@ services: 
        constraints:

          - node.role == worker

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '2'

          memory: 120M

          memory: 128M

        reservations:

          memory: 50M



networks:

  traefik-net:

    external: true
 
          memory: 103M