Commit 7c95c1b0 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Renombra variables de postgres

See merge request redmic-project/server/vessel/postgresql!3
parents 28797991 6b515fd3

.env

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

.gitlab-ci.yml

+4 −10
Original line number Diff line number Diff line
@@ -83,9 +83,6 @@ deploy-dev: 
    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    POSTGRES_USER: ${DEV_AIS_POSTGRES_USER}

    POSTGRES_PASSWORD: ${DEV_AIS_POSTGRES_PASSWORD}

    POSTGRES_DB: ${AIS_POSTGRES_DB}

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

    STATUS_CHECK_DELAY: 60

  services:
@@ -93,8 +90,8 @@ deploy-dev: 
  script:

    - >

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

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

      POSTGRES_PASSWORD=${POSTGRES_PASSWORD} POSTGRES_DB=${POSTGRES_DB}

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

      POSTGRES_PASSWORD=${AIS_POSTGRES_PASSWORD}

  environment:

    name: dev

  only:
@@ -113,9 +110,6 @@ deploy-pro: 
    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    POSTGRES_USER: ${PRO_AIS_POSTGRES_USER}

    POSTGRES_PASSWORD: ${PRO_AIS_POSTGRES_PASSWORD}

    POSTGRES_DB: ${AIS_POSTGRES_DB}

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

    STATUS_CHECK_DELAY: 60

  services:
@@ -123,8 +117,8 @@ deploy-pro: 
  script:

    - >

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

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

      POSTGRES_PASSWORD=${POSTGRES_PASSWORD} POSTGRES_DB=${POSTGRES_DB}

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

      POSTGRES_PASSWORD=${AIS_POSTGRES_PASSWORD}

  environment:

    name: pro

  only: