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

Merge branch 'dev' into 'master' 

Actualiza variable de vol y versión compose

See merge request redmic-project/postgres/pgadmin!8
parents bb6dd3ea bd66a0f5

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -9,5 +9,3 @@ stages: 
.deploy:

  variables:

    STACK: postgres
 
  environment:

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

deploy/docker-compose.dev.yml

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

version: '3.9'



volumes:

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

    driver_opts:

      type: ${VOL_TYPE:-nfs4}

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

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

      device: ${PGADMIN_VOL_DEVICE:-:/pgadmin-vol/}

deploy/docker-compose.prod.yml

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

version: '3.9'



volumes:

  pgadmin-vol:

deploy/docker-compose.tmpl.yml

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

version: '3.9'



services:

  pgadmin: