Commit f523ed1d authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Actualiza config para desplegar en prod

See merge request redmic-project/postgres/postgresql!1
parents 5693787d 77898a7e

.gitlab-ci.yml

+15 −11
Original line number Diff line number Diff line
@@ -60,44 +60,48 @@ container_scanning: 
    paths: [gl-sast-container-report.json]





deploy-postgres-master-dev:

deploy-postgresql-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

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

  services:

    - docker:dind

  script:

    - create-nets.sh postgres-net

    - >

      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

  only:

    - dev

  when: manual



deploy-postgres-slave-dev:

deploy-postgresql-pro:

  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

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

  services:

    - docker:dind

  script:

    - create-nets.sh postgres-net

    - >

      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: prod

  only:

    - dev

    - master

  when: manual

Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM postgres:10.3



ENV PG_PORT="5432" \

	PG_MAX_CONNECTIONS="100" \

	PG_MAX_CONNECTIONS="400" \

	PG_SHARED_PRELOAD_LIBRARIES="pg_cron" \

	PG_WAL_LEVEL="logical" \

	PG_MAX_WAL_SIZE="5GB" \

docker-compose.dev.yml

0 → 100644
+12 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  postgresql:

    container_name: postgresql

    restart: on-failure:3

    ports:

      - 5432:5432



volumes:

  postgres-vol:

    name: postgres-vol

docker-compose.postgresql-master.dev.yml

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
version: '3.5'



services:

  postgresql-master:

    container_name: postgresql-master

    restart: on-failure:3



networks:

  postgres-net:

    name: postgres-net



volumes:

  postgres-master-vol:

    name: postgres-master-vol

docker-compose.postgresql-slave.dev.yml

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
version: '3.5'



services:

  postgresql-slave:

    container_name: postgresql-slave

    restart: on-failure:3



networks:

  postgres-net:

    external: true



volumes:

  postgres-slave-vol:

    name: postgres-slave-vol
 
 No newline at end of file