Commit 4a40b47c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Aumenta memoria, limpia CI y sube versión compose

See merge request redmic-project/storage/minio!8
parents 8eda03e0 5c80aa1f

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -9,5 +9,3 @@ stages: 
.deploy:

  variables:

    STACK: storage
 
  environment:

    url: https://${CI_PROJECT_NAME}.${PUBLIC_HOSTNAME}

deploy/docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  minio:

deploy/docker-compose.tmpl.yml

+5 −5
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  minio:
@@ -7,7 +7,7 @@ services: 
    environment:

      MINIO_ROOT_USER:

      MINIO_ROOT_PASSWORD:

      MINIO_SERVER_URL: https://${TRAEFIK_SERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}

      MINIO_SERVER_URL: http://127.0.0.1:${SERVER_PORT}

      MINIO_BROWSER_REDIRECT_URL: https://${TRAEFIK_CONSOLE_SUBDOMAIN}.${PUBLIC_HOSTNAME}

      MINIO_PROMETHEUS_URL:

      MINIO_PROMETHEUS_JOB_ID:
@@ -19,7 +19,7 @@ services: 
    volumes:

      - data-vol:${DATA_PATH}

    healthcheck:

      test: curl --fail --silent http://localhost:${SERVER_PORT}/minio/health/live

      test: curl --fail --silent http://127.0.0.1:${SERVER_PORT}/minio/health/live

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-15s}

      retries: ${HEALTHCHECK_RETRIES:-5}
@@ -41,10 +41,10 @@ services: 
      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

          memory: ${RESOURCES_LIMITS_MEMORY:-512M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-256M}



networks:

  minio-net: