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

Merge branch 'dev' into 'master' 

Migra labels hacia Traefik v2, revisa jobs CI

See merge request redmic-project/auth/phpldapadmin!3
parents dc138223 3f64005e

.gitlab-ci.yml

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

  - deploy



variables:

  PROJECT_PARENT_NAME: auth



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}
 
    STACK: auth

deploy/.env

+3 −1
Original line number Diff line number Diff line 
PHPLDAPADMIN_LDAP_HOSTS=openldap

PHPLDAPADMIN_HTTPS=false

PHPLDAPADMIN_LDAP_CLIENT_TLS=false

DATA_VOL_NAME=phpldapadmin-data-vol



PUBLIC_HOSTNAME=change.me



DATA_VOL_NAME=phpldapadmin-data-vol



VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

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

deploy/docker-compose.tmpl.yml

+4 −3
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ services: 
      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

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

        traefik.backend: phpldapadmin

        traefik.port: '80'

        traefik.enable: 'true'

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

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

        traefik.http.services.phpldapadmin.loadbalancer.server.port: 80

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'

README.md

+1 −1

File changed.

Contains only whitespace changes.