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

Aumenta mínimo de memoria, revisa config 

Reubica ficheros de configuración de despliegue y genera ficheros por
entorno (aunque no se usen por ahora).

Aumenta a 6MB el mínimo de memoria, por requisitos de docker 20.10.

Corrige variables en job de despliegue.
parent 62f52f6a

.gitlab-ci.yml

+1 −9
Original line number Diff line number Diff line
@@ -8,13 +8,5 @@ stages: 


.deploy:

  variables:

    STACK: storage

    FORCE_DOCKER_COMPOSE: 1



.deploy-development:

  variables:

    COMPOSE_FILE: docker-compose.yml



.deploy-production:

  variables:

    COMPOSE_FILE: docker-compose.yml
 
    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}

.env→deploy/.env

+0 −0

File moved.

View file

deploy/docker-compose.dev.yml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
version: '2.4'

deploy/docker-compose.prod.yml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
version: '2.4'

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ services: 
    restart: always

    cpus: '${CPUS:-0.5}'

    mem_limit: ${MEM_LIMIT:-32M}

    mem_reservation: ${MEM_RESERVATION:-4M}

    mem_reservation: ${MEM_RESERVATION:-6M}



volumes:

  data-vol: