Commit 491e34ad authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/storage/minio!9
parents 4a40b47c 0de02b44

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy

deploy/.env

+8 −0
Original line number Diff line number Diff line
@@ -8,6 +8,14 @@ MINIO_PROMETHEUS_URL=http://prometheus:9090 
MINIO_PROMETHEUS_JOB_ID=minio

MINIO_PROMETHEUS_AUTH_TYPE=public



TRAEFIK_ENTRYPOINT=http

TRAEFIK_SERVER_SUBDOMAIN=minioapi

TRAEFIK_CONSOLE_SUBDOMAIN=minio

PUBLIC_HOSTNAME=change.me



DATA_VOL_NAME=minio-vol



VOL_DRIVER=local

VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

deploy/docker-compose.dev.yml→deploy/compose.dev.yaml

+4 −6
Original line number Diff line number Diff line 
version: '3.9'



services:

  minio:

    networks:
@@ -13,9 +11,9 @@ networks: 


volumes:

  data-vol:

    name: ${DATA_VOL_NAME:-minio-vol}

    driver: local

    name: ${DATA_VOL_NAME}

    driver: ${VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE:-nfs4}

      o: addr=${VOL_ADDR:-127.0.0.1},${VOL_OPTS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${DATA_VOL_DEVICE:-:/minio-vol/}

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

+11 −8
Original line number Diff line number Diff line 
version: '3.9'



services:

  minio:

    image: ${IMAGE_NAME:-minio/minio}:${IMAGE_TAG:-latest}
@@ -32,12 +30,17 @@ services: 
      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

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

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

        traefik.server.backend: server

        traefik.console.backend: console

        traefik.server.port: '${SERVER_PORT}'

        traefik.console.port: '${CONSOLE_PORT}'

        traefik.enable: ${TRAEFIK_ENABLE:-true}



        traefik.http.routers.minio-server.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.minio-server.rule: Host(`${TRAEFIK_SERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}`)

        traefik.http.routers.minio-server.service: minio-server

        traefik.http.services.minio-server.loadbalancer.server.port: ${SERVER_PORT}



        traefik.http.routers.minio-console.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.minio-console.rule: Host(`${TRAEFIK_CONSOLE_SUBDOMAIN}.${PUBLIC_HOSTNAME}`)

        traefik.http.routers.minio-console.service: minio-console

        traefik.http.services.minio-console.loadbalancer.server.port: ${CONSOLE_PORT}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'