Commit 95c04507 authored by Nacho's avatar Nacho
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/postgres/postgresql into dev

parents 466f3bc3 8facacc9

.gitlab-ci.yml

+10 −8
Original line number Diff line number Diff line
@@ -60,44 +60,46 @@ container_scanning: 
    paths: [gl-sast-container-report.json]





deploy-postgres-master-dev:

deploy-postgresql-master-dev:

  stage: deploy

  image: redmic/docker-gitlab

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}-master

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-master.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-master.dev.yml

  services:

    - docker:dind

  script:

    - >

      deploy.sh DOCKER_ENV_CI_REGISTRY_IMAGE=${DOCKER_ENV_CI_REGISTRY_IMAGE} IMAGE_TAG=${IMAGE_TAG}

      COMPOSE_FILE=${COMPOSE_FILE} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

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

      POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

  environment:

    name: dev/master

    name: dev/${CI_PROJECT_NAME}-master

  only:

    - dev

  when: manual



deploy-postgres-slave-dev:

deploy-postgresql-slave-dev:

  stage: deploy

  image: redmic/docker-gitlab

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}-slave

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-slave.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-slave.dev.yml

  services:

    - docker:dind

  script:

    - >

      deploy.sh DOCKER_ENV_CI_REGISTRY_IMAGE=${DOCKER_ENV_CI_REGISTRY_IMAGE} IMAGE_TAG=${IMAGE_TAG}

      COMPOSE_FILE=${COMPOSE_FILE} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

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

      POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

  environment:

    name: dev/slave

    name: dev/${CI_PROJECT_NAME}-slave

  only:

    - dev

  when: manual

docker-compose.postgresql-master.dev.yml

+2 −4
Original line number Diff line number Diff line
@@ -4,10 +4,8 @@ services: 
  postgresql-master:

    container_name: postgresql-master

    restart: on-failure:3



networks:

  postgres-net:

    name: postgres-net

    ports:

      - 5432



volumes:

  postgres-master-vol:

docker-compose.postgresql-master.tmpl.yml

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


services:

  postgresql-master:

    image: ${DOCKER_ENV_CI_REGISTRY_IMAGE}:${IMAGE_TAG:-latest}

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - ROLE=master

      - POSTGRES_PASSWORD
@@ -10,7 +10,9 @@ services: 
      postgres-net:

        aliases:

          - postgresql_master

    ports:

      - 5432

    volumes:

      - postgres-master-vol:/var/lib/postgresql/data



networks:

  postgres-net:

    external: true

docker-compose.postgresql-slave.dev.yml

+3 −5
Original line number Diff line number Diff line
@@ -4,10 +4,8 @@ services: 
  postgresql-slave:

    container_name: postgresql-slave

    restart: on-failure:3



networks:

  postgres-net:

    external: true

    ports:

      - 5432



volumes:

  postgres-slave-vol:

docker-compose.postgresql-slave.tmpl.yml

+5 −3
Original line number Diff line number Diff line
@@ -2,14 +2,16 @@ version: '3.5' 


services:

  postgresql-slave:

    image: ${DOCKER_ENV_CI_REGISTRY_IMAGE}:${IMAGE_TAG:-latest}

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - POSTGRES_PASSWORD

    networks:

      postgres-net:

        aliases:

          - postgresql_slave

    ports:

      - 5432

    volumes:

      - postgres-slave-vol:/var/lib/postgresql/data



networks:

  postgres-net:

    external: true