Commit 1d587230 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/postgres/pgadmin!4
parents a2d51f04 262e42ca

.gitlab-ci.yml

+5 −8
Original line number Diff line number Diff line
@@ -7,14 +7,11 @@ stages: 
  - deploy



variables:

  STACK: postgres

  PROJECT_PARENT_NAME: postgres



.deploy:

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PGADMIN_SETUP_EMAIL=${PGADMIN_SETUP_EMAIL} PGADMIN_SETUP_PASSWORD=${PGADMIN_SETUP_PASSWORD}

      MAIL_SERVER=${MAIL_SERVER} MAIL_USER=${MAIL_USER} MAIL_PASSWORD=${MAIL_PASSWORD}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

  environment:

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

deploy/docker-compose.dev.yml

+7 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  pgadmin:

    deploy:

      placement:

        constraints:

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



volumes:

  pgadmin-vol:

    name: ${PGADMIN_VOL_NAME:-pgadmin-vol}

deploy/docker-compose.tmpl.yml

+21 −23
Original line number Diff line number Diff line
@@ -4,47 +4,45 @@ services: 
  pgadmin:

    image: ${IMAGE_NAME:-chorss/docker-pgadmin4}:${IMAGE_TAG:-latest}

    environment:

      - SERVER_MODE

      - PGADMIN_SETUP_EMAIL

      - PGADMIN_SETUP_PASSWORD

      - MAIL_SERVER

      - MAIL_PORT

      - MAIL_USE_TLS

      - MAIL_USER

      - MAIL_PASSWORD

      SERVER_MODE:

      PGADMIN_SETUP_EMAIL:

      PGADMIN_SETUP_PASSWORD:

      MAIL_SERVER:

      MAIL_PORT:

      MAIL_USE_TLS:

      MAIL_USER:

      MAIL_PASSWORD:

    networks:

      - postgres-net

      - postgres-vessel-net

      - traefik-net

      postgres-net:

      traefik-net:

    volumes:

      - pgadmin-vol:/data

    deploy:

      mode: replicated

      replicas: 1

      replicas: ${REPLICAS:-1}

      labels:

        traefik.frontend.rule: Host:pgadmin.${PUBLIC_HOSTNAME}

        traefik.backend: pgadmin

        traefik.port: '${PGADMIN_PORT}'

      placement:

        constraints:

          - node.role == manager

      restart_policy:

        delay: 30s

        window: 2m

        delay: ${RESTART_DELAY:-30s}

      update_config:

        delay: ${UPDATE_DELAY:-2m}

      resources:

        limits:

          cpus: '0.5'

          memory: 128M

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-128M}

        reservations:

          memory: 103M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-103M}



networks:

  postgres-net:

    name: ${POSTGRES_NET_NAME:-postgres-net}

    driver: ${POSTGRES_NET_DRIVER:-overlay}

    external: true

  postgres-vessel-net:

    name: ${POSTGRES_VESSEL_NET_NAME:-postgres-vessel-net}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    driver: ${TRAEFIK_NET_DRIVER:-overlay}

    external: true