Commit f40c3d8c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Reorganiza recursos de deploy y corrige detalles

parent 96304377

.gitlab-ci.yml

+26 −4
Original line number Diff line number Diff line
@@ -73,8 +73,29 @@ deploy-dev: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    STATUS_CHECK_DELAY: 60

    STATUS_CHECK_INTERVAL: 30

    POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}

  script:

    - create-nets.sh postgres-net

    - >

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

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

    POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}

  script:

    - create-nets.sh postgres-net

    - >
@@ -86,6 +107,7 @@ deploy-dev: 
    - branches

  except:

    - master

    - dev

  when: manual



deploy-pro:
@@ -98,8 +120,8 @@ deploy-pro: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    STATUS_CHECK_DELAY: 120

    STATUS_CHECK_INTERVAL: 30

    AWS_REGION: ${AWS_REGION}

    POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}

  script:

    - create-nets.sh postgres-net

    - >

Dockerfile

+2 −0
Original line number Diff line number Diff line 
FROM postgres:10.3



LABEL maintainer="info@redmic.es"



ENV PG_PORT="5432" \

	PG_MAX_CONNECTIONS="400" \

	PG_SHARED_PRELOAD_LIBRARIES="pg_cron" \

.env→deploy/.env

+0 −0

File moved.

View file

docker-compose.dev.yml→deploy/docker-compose.dev.yml

+0 −0

File moved.

View file

docker-compose.prod.yml→deploy/docker-compose.prod.yml

+0 −0

File moved.

View file