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

Agrega valor de credenciales para elastic

parent 3218bcd8

.gitlab-ci.yml

+4 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ maven-build: 
    AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}

    AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}

    TEST_USER_PASSWORD: ${TEST_USER_PASSWORD}

    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

  only:

    - branches

  except:
@@ -110,7 +111,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}

      AWS_SECRET_KEY=${DEV_AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${DEV_ELASTIC_XPACKSECURITYUSER}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
@@ -135,7 +136,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}

      AWS_SECRET_KEY=${DEV_AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${DEV_ELASTIC_XPACKSECURITYUSER}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
@@ -164,7 +165,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}

      AWS_SECRET_KEY=${PRO_AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${PRO_ELASTIC_XPACKSECURITYUSER}

  environment:

    name: pro

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

docker-compose.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ services: 
      - OAUTH_CLIENT_SECRET

      - AWS_ACCESS_KEY

      - AWS_SECRET_KEY

      - ELASTIC_XPACKSECURITYUSER

      - JAVA_OPTS=-Xmx1g -Xss1g

    networks:

      - elastic-net