Commit dc138223 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/auth/phpldapadmin!2
parents 2c5d5b15 7b871218

deploy/.env

+4 −0
Original line number Diff line number Diff line
@@ -3,3 +3,7 @@ PHPLDAPADMIN_HTTPS=false 
PHPLDAPADMIN_LDAP_CLIENT_TLS=false

DATA_VOL_NAME=phpldapadmin-data-vol

PUBLIC_HOSTNAME=change.me



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

+6 −8
Original line number Diff line number Diff line 
version: '3.5'



services:

  phpldapadmin:

    deploy:

      placement:

        constraints:

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

version: '3.9'



volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

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

      device: ${DATA_VOL_DEVICE:-:/phpldapadmin-data-vol/}

deploy/docker-compose.prod.yml

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

version: '3.9'



volumes:

  data-vol:

deploy/docker-compose.tmpl.yml

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

version: '3.9'



services:

  phpldapadmin: