Commit 020bd32b authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza deploy, limita recursos y transforma dev

See merge request redmic-project/server/vessel/postgresql!11
parents 49dc304a 5abfcb9b

.env

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
POSTGRES_DB=ais

.gitlab-ci.yml

+40 −31
Original line number Diff line number Diff line
@@ -3,13 +3,15 @@ stages: 
  - test-package

  - deploy



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

  stage: package

  image: docker:stable

variables:

  DOCKER_DRIVER: overlay2



services:

  - docker:dind



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

  stage: package

  image: docker:stable

  only:

    - branches

  except:
@@ -22,10 +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:
@@ -36,10 +34,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:
@@ -50,11 +44,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:
@@ -74,51 +64,70 @@ container-scanning: 
      -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]



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

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    POSTGRES_USER: ${AIS_POSTGRES_USER}

    POSTGRES_PASSWORD: ${AIS_POSTGRES_PASSWORD}

  script:

    - >

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

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

  environment:

    name: dev

  only:

    - dev

  when: manual



deploy-supporting-branch:

  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${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

    POSTGRES_USER: ${AIS_POSTGRES_USER}

    POSTGRES_PASSWORD: ${AIS_POSTGRES_PASSWORD}

  script:

    - >

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

      COMPOSE_FILE=${COMPOSE_FILE} POSTGRES_USER=${AIS_POSTGRES_USER}

      POSTGRES_PASSWORD=${AIS_POSTGRES_PASSWORD}

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

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

  environment:

    name: dev

  only:

    - branches

  except:

    - master

    - dev

  when: manual



deploy-pro:

  stage: deploy

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

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    STATUS_CHECK_DELAY: 60

  services:

    - docker:dind

    POSTGRES_USER: ${AIS_POSTGRES_USER}

    POSTGRES_PASSWORD: ${AIS_POSTGRES_PASSWORD}

  script:

    - >

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

      COMPOSE_FILE=${COMPOSE_FILE} POSTGRES_USER=${AIS_POSTGRES_USER}

      POSTGRES_PASSWORD=${AIS_POSTGRES_PASSWORD}

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

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

  environment:

    name: pro

  only:

Dockerfile

+2 −0
Original line number Diff line number Diff line 
FROM mdillon/postgis:10-alpine



LABEL maintainer="info@redmic.es"



COPY /scripts/ /docker-entrypoint-initdb.d/

deploy/.env

0 → 100644
+2 −0
Original line number Diff line number Diff line 
POSTGRES_DB=ais

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

deploy/docker-compose.dev.yml

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



services:

  postgresql:

    deploy:

      mode: replicated

      replicas: 1

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.75'

          memory: 1G

        reservations:

          memory: 820M



volumes:

  ais-postgres-vol:

    name: ais-postgres-vol