Commit b43d2dec authored by Noel Alonso's avatar Noel Alonso
Browse files

Corrige problema con variables de entorno y spring

parent 21b49fd7

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ variables: 
    DIND_IMAGE_NAME: docker

    DIND_IMAGE_TAG: dind

    DOCKER_HOST: tcp://docker:2375

    SPRING_DATASOURCE_JDBC_URL: jdbc:postgresql://docker:5432/redmic?stringtype=unspecified&currentSchema=sde

    JOB_DATASOURCE_JDBC_URL: jdbc:postgresql://docker:5432/redmic?currentSchema=job

    SPRING_DATASOURCE_URL: jdbc:postgresql://docker:5432/redmic?stringtype=unspecified&currentSchema=sde

    JOB_DATASOURCE_URL: jdbc:postgresql://docker:5432/redmic?currentSchema=job

    ELASTIC_ADDRESSES: docker

src/main/resources/application-dev.properties

+2 −2
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ spring.kafka.bootstrap-servers=localhost:19092 
spring.kafka.properties.schema.registry.url=http://localhost:18081



# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)

spring.datasource.jdbc-url=jdbc:postgresql://localhost:5432/redmic

spring.datasource.url=jdbc:postgresql://localhost:5432/redmic



# DATASOURCE Jobs

jobs.datasource.schema=job

jobs.datasource.name=redmic

jobs.datasource.jdbc-url=jdbc:postgresql://localhost:5432/redmic?currentSchema=job

jobs.datasource.url=jdbc:postgresql://localhost:5432/redmic?currentSchema=job



#Mediastorage S3

aws.bucket=mediastorage.redmicdev

src/main/resources/application-pre.properties

+2 −2
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ spring.kafka.bootstrap-servers=kf-1:9092,kf-2:9092,kf-3:9092 
spring.kafka.properties.schema.registry.url=http://schema-registry:8081



# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)

spring.datasource.jdbc-url=jdbc:postgresql://db:5432/redmic

spring.datasource.url=jdbc:postgresql://db:5432/redmic



# DATASOURCE Jobs

jobs.datasource.schema=job

jobs.datasource.name=redmic

jobs.datasource.jdbc-url=jdbc:postgresql://db:5432/redmic?currentSchema=job

jobs.datasource.url=jdbc:postgresql://db:5432/redmic?currentSchema=job



#Mediastorage S3

aws.bucket=mediastorage.redmicdev

src/main/resources/application-prod.properties

+2 −2
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ spring.kafka.bootstrap-servers=kf-1:9092,kf-2:9092,kf-3:9092 
spring.kafka.properties.schema.registry.url=http://schema-registry:8081



# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)

spring.datasource.jdbc-url=jdbc:postgresql://db:5432/redmic

spring.datasource.url=jdbc:postgresql://db:5432/redmic



# DATASOURCE Jobs

jobs.datasource.schema=job

jobs.datasource.name=redmic

jobs.datasource.jdbc-url=jdbc:postgresql://db:5432/redmic?currentSchema=job

jobs.datasource.url=jdbc:postgresql://db:5432/redmic?currentSchema=job





#Mediastorage S3

src/main/resources/application-test.properties

+2 −2
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers} 
spring.kafka.properties.schema.registry.url=http://localhost:${schema.registry.port}



# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)

spring.datasource.jdbc-url=jdbc:postgresql://localhost:5432/redmic?stringtype=unspecified&currentSchema=sde

spring.datasource.url=jdbc:postgresql://localhost:5432/redmic?stringtype=unspecified&currentSchema=sde



# DATASOURCE Jobs

jobs.datasource.schema=job

jobs.datasource.name=redmic

jobs.datasource.jdbc-url=jdbc:postgresql://localhost:5432/redmic?currentSchema=job

jobs.datasource.url=jdbc:postgresql://localhost:5432/redmic?currentSchema=job



#Mediastorage S3

aws.bucket=mediastorage.redmicdev