Commit 0901353e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Elimina prefijo innecesario de variables

parent d94433a4

deploy/docker-compose.dev.yml

+4 −4
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ services: 
    deploy:

      resources:

        limits:

          cpus: '${POSTGRESQL_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${POSTGRESQL_RESOURCES_LIMITS_MEMORY:-512M}

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-512M}

        reservations:

          cpus: '${POSTGRESQL_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${POSTGRESQL_RESOURCES_RESERVATIONS_MEMORY:-128M}

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}



volumes:

  postgres-data-vol:

deploy/docker-compose.prod.yml

+4 −4
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ services: 
          - engine.labels.availability_zone == ${AWS_REGION}${DESIRED_WORKER_ID}

      resources:

        limits:

          cpus: '${POSTGRESQL_RESOURCES_LIMITS_CPUS:-2}'

          memory: ${POSTGRESQL_RESOURCES_LIMITS_MEMORY:-1G}

          cpus: '${RESOURCES_LIMITS_CPUS:-2}'

          memory: ${RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          cpus: '${POSTGRESQL_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${POSTGRESQL_RESOURCES_RESERVATIONS_MEMORY:-512M}

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-512M}



volumes:

  postgres-data-vol:

deploy/docker-compose.tmpl.yml

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


services:

  postgresql:

    image: ${POSTGRESQL_IMAGE_NAME:-registry.gitlab.com/redmic-project/postgres/postgresql}:${POSTGRESQL_IMAGE_TAG:-latest}

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/postgres/postgresql}:${IMAGE_TAG:-latest}

    build:

      context: ..

      dockerfile: ${DOCKERFILE:-Dockerfile}
@@ -33,11 +33,11 @@ services: 
        target: /home/REDMIC/Mail/dist/layout.mustache

    deploy:

      mode: replicated

      replicas: ${POSTGRESQL_REPLICAS:-1}

      replicas: ${REPLICAS:-1}

      restart_policy:

        delay: ${POSTGRESQL_RESTART_DELAY:-10s}

        delay: ${RESTART_DELAY:-10s}

      update_config:

        delay: ${POSTGRESQL_UPDATE_DELAY:-1m}

        delay: ${UPDATE_DELAY:-1m}



networks:

  postgres-net: