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

Merge branch 'dev' into 'master' 

Cambia restricción de nodo por volumen NFS

See merge request redmic-project/storage/artifactory!4
parents 7bce4ec9 7cba5bcb

.gitlab-ci.yml

+1 −5
Original line number Diff line number Diff line
@@ -6,12 +6,8 @@ include: 
stages:

  - deploy



variables:

  PROJECT_PARENT_NAME: storage



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STACK: storage

  environment:

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

deploy/.env

+4 −0
Original line number Diff line number Diff line 
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

deploy/docker-compose.dev.yml

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



services:

  artifactory:

    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}



volumes:

  data-vol:

    name: ${DATA_VOL_NAME:-artifactory-vol}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

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

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

README.md

+1 −1

File changed.

Contains only whitespace changes.