Commit 93c0484f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Adapta deploy de dev a Swarm y limita recursos

See merge request redmic-project/postgres/postgresql!20
parents 84a74f94 96304377

.env

+3 −0
Original line number Diff line number Diff line 
ROLE=master

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

POSTGRES_INITDB_WALDIR=/postgresql/wal/wal-files

DESIRED_WORKER_ID=a

.gitlab-ci.yml

+11 −27
Original line number Diff line number Diff line 
image: docker:stable



stages:

  - package

  - test-package

  - deploy



docker-build-commit-non-master-branches:

  stage: package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

services:

  - docker:dind



variables:

  DOCKER_DRIVER: overlay2



docker-build-commit-non-master-branches:

  stage: package

  only:

    - branches

  except:
@@ -21,11 +24,6 @@ docker-build-commit-non-master-branches: 


docker-build-commit-master-branch:

  stage: package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:

    - docker:dind

  only:

    - master

  script:
@@ -35,11 +33,6 @@ docker-build-commit-master-branch: 


docker-tag-already-built-image:

  stage: package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:

    - docker:dind

  only:

    - tags

  script:
@@ -49,12 +42,7 @@ docker-tag-already-built-image: 


container-scanning:

  stage: test-package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  allow_failure: true

  services:

    - docker:stable-dind

  only:

    - branches

  except:
@@ -79,15 +67,14 @@ deploy-dev: 
  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STACK: postgres

    SERVICES_TO_CHECK: postgres_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    STATUS_CHECK_DELAY: 60

  services:

    - docker:dind

    STATUS_CHECK_INTERVAL: 30

  script:

    - create-nets.sh postgres-net

    - >
@@ -105,7 +92,6 @@ deploy-pro: 
  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: postgres

    SERVICES_TO_CHECK: postgres_${CI_PROJECT_NAME}
@@ -114,8 +100,6 @@ deploy-pro: 
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    STATUS_CHECK_DELAY: 120

    STATUS_CHECK_INTERVAL: 30

  services:

    - docker:dind

  script:

    - create-nets.sh postgres-net

    - >

Dockerfile

+2 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ ENV PG_PORT="5432" \ 
	PG_POSTGIS_VERSION="2.4" \

	CONFIG_PATH="/"





COPY scripts /tmp



RUN apt-get update \

docker-compose.dev.yml

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


services:

  postgresql:

    container_name: postgresql

    restart: on-failure:3

    ports:

      - 5432:5432

      - target: 5432

        published: 5432

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '2'

          memory: 1G

        reservations:

          memory: 820M



volumes:

  postgres-data-vol:

docker-compose.prod.yml

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ services: 
        condition: on-failure

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '2'

          memory: 2G

        reservations:

          memory: 1639M



volumes:

  postgres-data-vol: