Commit 1603d508 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Migra labels a Traefik v2, limpia

See merge request redmic-project/storage/artifactory!5
parents cde7dfae 45c877cc

.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/.env

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ PUBLIC_HOSTNAME=change.me 


VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

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

deploy/docker-compose.dev.yml

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

version: '3.9'



volumes:

  data-vol:
@@ -6,5 +6,5 @@ volumes: 
    driver: local

    driver_opts:

      type: ${VOL_TYPE}

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

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

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

deploy/docker-compose.tmpl.yml

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

version: '3.9'



services:

  artifactory:
@@ -15,9 +15,10 @@ services: 
      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

        traefik.frontend.rule: Host:${TRAEFIK_SUBDOMAIN:-artifactory}.${PUBLIC_HOSTNAME}

        traefik.backend: artifactory

        traefik.port: '${PORT:-8081}'

        traefik.enable: ${TRAEFIK_ENABLE:-true}

        traefik.http.routers.artifactory.entrypoints: ${TRAEFIK_ENTRYPOINT:-http}

        traefik.http.routers.artifactory.rule: Host(`${TRAEFIK_SUBDOMAIN:-artifactory}.${PUBLIC_HOSTNAME}`)

        traefik.http.services.artifactory.loadbalancer.server.port: ${PORT:-8081}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'