Commit 699768a5 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/postgres/pgadmin!9
parents f142397c 862fe0a1

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy

README.md

+3 −0
Original line number Diff line number Diff line 
# pgAdmin



Configuration and deployment for pgAdmin

deploy/.env

+2 −0
Original line number Diff line number Diff line
@@ -10,4 +10,6 @@ PGADMIN_CONFIG_MAIL_USERNAME= 
PGADMIN_CONFIG_MAIL_PASSWORD=

PGADMIN_CONFIG_SECURITY_EMAIL_SENDER=info@redmic.es



PUBLIC_HOSTNAME=change.me



PGADMIN_VOL_NAME=pgadmin-vol

deploy/docker-compose.dev.yml→deploy/compose.dev.yaml

+1 −3
Original line number Diff line number Diff line 
version: '3.9'



volumes:

  pgadmin-vol:

    name: ${PGADMIN_VOL_NAME}

    driver: local

    driver: ${VOL_DRIVER:-local}

    driver_opts:

      type: ${VOL_TYPE:-nfs4}

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

deploy/docker-compose.prod.yml→deploy/compose.prod.yaml

+0 −2
Original line number Diff line number Diff line 
version: '3.9'



volumes:

  pgadmin-vol:

    name: ${PGADMIN_VOL_NAME}