Commit 396217a3 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!5
parents 1d587230 14c4a11b

.gitignore

deleted100644 → 0
+0 −0

Empty file deleted.

.gitlab-ci.yml

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

  - deploy



variables:

  PROJECT_PARENT_NAME: postgres



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STACK: postgres

  environment:

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

deploy/.env

+12 −9
Original line number Diff line number Diff line 
PGADMIN_PORT=5050

PGADMIN_SETUP_EMAIL=postgres

PGADMIN_SETUP_PASSWORD=password

MAIL_USER=postgres

MAIL_PASSWORD=password

SERVER_MODE=true

MAIL_SERVER=mail.redmic.es

MAIL_PORT=25

MAIL_USE_TLS=true
 
PGADMIN_LISTEN_PORT=5050

PGADMIN_DEFAULT_EMAIL=postgres

PGADMIN_DEFAULT_PASSWORD=password

PGADMIN_CONFIG_MAIL_SERVER=smtp

PGADMIN_CONFIG_MAIL_PORT=25

PGADMIN_CONFIG_MAIL_USE_SSL=False

PGADMIN_CONFIG_MAIL_USE_TLS=True

PGADMIN_CONFIG_MAIL_USERNAME=

PGADMIN_CONFIG_MAIL_PASSWORD=

PGADMIN_CONFIG_SECURITY_EMAIL_SENDER=info@redmic.es



PGADMIN_VOL_NAME=pgadmin-vol

deploy/docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ services: 


volumes:

  pgadmin-vol:

    name: ${PGADMIN_VOL_NAME:-pgadmin-vol}
 
    name: ${PGADMIN_VOL_NAME}

deploy/docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ version: '3.5' 


volumes:

  pgadmin-vol:

    name: ${PGADMIN_VOL_NAME:-pgadmin-vol}

    name: ${PGADMIN_VOL_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: shared