Commit 499d9810 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/postgres/postgresql!39
parents 1d494c2f 47814593

.gitlab-ci.yml

+7 −71
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ include: 
  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-custom-image.yml'

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

    ref: dev

    file: '/deployment-external-backup-postgresql.yml'

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

    ref: master

    file: '/maintenance.yml'
@@ -17,6 +20,7 @@ stages: 
  - package

  - post-package

  - deploy

  - deploy-external-service

  - maintenance



variables:
@@ -26,87 +30,19 @@ variables: 
.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}



.deploy-development:

  variables:

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

  environment:

    name: dev/${CI_PROJECT_NAME}



.deploy-production:

  variables:

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

  environment:

    name: pro/${CI_PROJECT_NAME}



.deploy-backup:

  variables: &deploy-backup-variables

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_backup-db

    DD_AWS_REGION: ${AWS_REGION}



.deploy-backup-development:

  extends: .deploy-development

.deploy-external-service:

  variables:

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

    <<: *deploy-backup-variables

  environment:

    name: dev/backup-db



.deploy-backup-production:

  extends: .deploy-production

  variables:

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

    <<: *deploy-backup-variables

  environment:

    name: pro/backup-db



.deploy-backup-support-branch: &deploy-backup-support-branch

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH

      when: manual

      allow_failure: true



deploy-backup-support-branch-development:

  extends: .deploy-backup-development

  <<: *deploy-backup-support-branch



.deploy-backup-stable-branch: &deploy-backup-stable-branch

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

      when: manual

      allow_failure: true



deploy-backup-stable-branch-development:

  extends: .deploy-backup-development

  <<: *deploy-backup-stable-branch



deploy-backup-stable-branch-production:

  extends: .deploy-backup-production

  <<: *deploy-backup-stable-branch



.deploy-backup-tag: &deploy-backup-tag

  rules:

    - if: $CI_COMMIT_TAG

      when: manual

      allow_failure: true



deploy-backup-tag-development:

  extends: .deploy-backup-development

  <<: *deploy-backup-tag



deploy-backup-tag-production:

  extends: .deploy-backup-production

  <<: *deploy-backup-tag

    STACK: ${PROJECT_PARENT_NAME}

    DD_AWS_REGION: ${AWS_REGION}



.scheduled-run:

  variables:

Dockerfile

+30 −14
Original line number Diff line number Diff line 
FROM postgres:10.6

ARG POSTGRES_IMAGE_TAG=10.6



FROM postgres:${POSTGRES_IMAGE_TAG}



LABEL maintainer="info@redmic.es"
@@ -7,24 +9,38 @@ ENV PG_PORT="5432" \ 
	PG_SHARED_PRELOAD_LIBRARIES="pg_cron" \

	POSTGRES_USER="postgres" \

	POSTGRES_PASSWORD="password" \

	PG_POSTGIS_VERSION="2.5" \

	CONFIG_PATH="/"



COPY scripts /tmp



RUN apt-get update \

	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

ARG LOCALES_VERSION=2.24-11+deb9u4 \

	PLPYTHON3_VERSION=10.16-1.pgdg90+1 \

	PYTHON3_PYSTACHE_VERSION=0.5.4-6 \

	PGCRON_VERSION=1.3.0-2.pgdg90+1 \

	POSTGIS_MAJOR=2.5 \

	POSTGIS_VERSION=2.5.5+dfsg-1.pgdg90+2 \

	GETTEXT_BASE_VERSION=0.19.8.1-2+deb9u1



RUN apt-get update && \

	apt-cache madison \

		locales \

		postgresql-plpython3-${PG_MAJOR} \

		"postgresql-plpython3-${PG_MAJOR}" \

		python3-pystache \

		postgresql-${PG_MAJOR}-cron \

		postgresql-${PG_MAJOR}-postgis-${PG_POSTGIS_VERSION} \

		postgresql-${PG_MAJOR}-postgis-${PG_POSTGIS_VERSION}-scripts \

		gettext-base \

	&& rm -rf /var/lib/apt/lists/* \

	&& localedef -i es_ES -c -f UTF-8 -A /usr/share/locale/locale.alias es_ES.UTF-8 \

	&& mv /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-entrypoint-origin.sh \

	&& mv /tmp/docker-entrypoint.sh /usr/local/bin/ \

	&& mv /tmp/pg_hba.conf /usr/share/postgresql/${PG_MAJOR}/pg_hba.conf.sample

		"postgresql-${PG_MAJOR}-cron" \

		"postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR}" \

		gettext-base && \

	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

		"locales=${LOCALES_VERSION}" \

		"postgresql-plpython3-${PG_MAJOR}=${PLPYTHON3_VERSION}" \

		"python3-pystache=${PYTHON3_PYSTACHE_VERSION}" \

		"postgresql-${PG_MAJOR}-cron=${PGCRON_VERSION}" \

		"postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR}=${POSTGIS_VERSION}" \

		"postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR}-scripts=${POSTGIS_VERSION}" \

		"gettext-base=${GETTEXT_BASE_VERSION}" && \

	rm -rf /var/lib/apt/lists/* && \

	localedef -i es_ES -c -f UTF-8 -A /usr/share/locale/locale.alias es_ES.UTF-8 && \

	mv /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-entrypoint-origin.sh && \

	mv /tmp/docker-entrypoint.sh /usr/local/bin/ && \

	mv /tmp/pg_hba.conf "/usr/share/postgresql/${PG_MAJOR}/pg_hba.conf.sample"



ENV LANG es_ES.utf8

deploy/.env

+11 −2
Original line number Diff line number Diff line 
POSTGRES_IMAGE_TAG=10.6

LOCALES_VERSION=2.24-11+deb9u4

PLPYTHON3_VERSION=10.16-1.pgdg90+1

PYTHON3_PYSTACHE_VERSION=0.5.4-6

PGCRON_VERSION=1.3.0-2.pgdg90+1

POSTGIS_MAJOR=2.5

POSTGIS_VERSION=2.5.5+dfsg-1.pgdg90+2

GETTEXT_BASE_VERSION=0.19.8.1-2+deb9u1



POSTGRES_USER=postgres

ROLE=master

PGDATA=/var/lib/postgresql/data/db-files

POSTGRES_INITDB_WALDIR=/postgresql/wal/wal-files

DESIRED_WORKER_ID=a

PORT=5432

POSTGRES_DATA_VOLUME_NAME=postgres-data-vol

POSTGRES_WAL_VOLUME_NAME=postgres-wal-vol

DATA_VOLUME_NAME=postgres-data-vol

WAL_VOLUME_NAME=postgres-wal-vol

POSTGRES_NET_NAME=postgres-net

deploy/docker-compose.backup-db.dev.yml

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



services:

    backup-db:

      deploy:

        placement:

          constraints:

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

deploy/docker-compose.backup-db.prod.yml

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



services:

  backup-db:

    deploy:

      placement:

        constraints:

          - node.role == worker

          - engine.labels.availability_zone == ${AWS_REGION}${DESIRED_WORKER_ID}