Commit 3b85a0dc authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Revisa y limpia variables para despliegue

parent 153bff9a

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ deploy-dev: 
      SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${DEV_AWS_ACCESS_KEY}

      AWS_SECRET_KEY=${DEV_AWS_SECRET_KEY} TEST_USER_PASSWORD=${TEST_USER_PASSWORD}

      AWS_SECRET_KEY=${DEV_AWS_SECRET_KEY}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
@@ -135,7 +135,7 @@ deploy-supporting-branch: 
      SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${DEV_AWS_ACCESS_KEY}

      AWS_SECRET_KEY=${DEV_AWS_SECRET_KEY} TEST_USER_PASSWORD=${TEST_USER_PASSWORD}

      AWS_SECRET_KEY=${DEV_AWS_SECRET_KEY}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
@@ -164,7 +164,7 @@ deploy-pro: 
      SPRING_PROFILES_ACTIVE=prod SPRING_DATASOURCE_USERNAME=${PRO_SPRING_DATASOURCE_USERNAME}

      SPRING_DATASOURCE_PASSWORD=${PRO_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${PRO_OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${PRO_AWS_ACCESS_KEY}

      AWS_SECRET_KEY=${PRO_AWS_SECRET_KEY} TEST_USER_PASSWORD=${TEST_USER_PASSWORD}

      AWS_SECRET_KEY=${PRO_AWS_SECRET_KEY}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}

docker-compose.tmpl.yml

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


services:

  api:

    image: registry.redmic.net/redmic-server/${MICROSERVICE_NAME}:${IMAGE_TAG:-latest}

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - MICROSERVICE_NAME

      - MICROSERVICE_PORT

      - SPRING_PROFILES_ACTIVE

      - SPRING_DATASOURCE_USERNAME

      - SPRING_DATASOURCE_PASSWORD
@@ -11,7 +13,6 @@ services: 
      - OAUTH_CLIENT_SECRET

      - AWS_ACCESS_KEY

      - AWS_SECRET_KEY

      - TEST_USER_PASSWORD

      - JAVA_OPTS=-Xmx1g -Xss1g

    networks:

      - elastic-net