Skip to content
Snippets Groups Projects
Commit acc8f439 authored by Martin Weise's avatar Martin Weise
Browse files

added dotenv, fixed some runtime ploblems, reduced elasticsearch output

Former-commit-id: 07fec9c5
parent 2c0d2f83
No related branches found
No related tags found
1 merge request!42Fixed the query service tests
.env 0 → 100644
# Sandbox, normally we need to remove this
ZENODO_API_KEY=OjphEf9axmjOxPqe419sTkhlVKZKA335NH5OGw0g4DyRUSd0LMryNtjNWg7x
\ No newline at end of file
...@@ -175,11 +175,9 @@ services: ...@@ -175,11 +175,9 @@ services:
- fda-public - fda-public
environment: environment:
SPRING_PROFILES_ACTIVE: docker SPRING_PROFILES_ACTIVE: docker
ZENODO_API_KEY: "${ZENODO_API_KEY}"
ports: ports:
- 9094:9094 - 9096:9096
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /tmp:/tmp
depends_on: depends_on:
fda-metadata-db: fda-metadata-db:
condition: service_healthy condition: service_healthy
...@@ -237,6 +235,7 @@ services: ...@@ -237,6 +235,7 @@ services:
environment: environment:
- discovery.type=single-node - discovery.type=single-node
- "ES_JAVA_OPTS=-Xms512m -Xmx512m" - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- logger.level=WARN
ports: ports:
- 9200:9200 - 9200:9200
- 9600:9600 - 9600:9600
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<jacoco.version>0.8.7</jacoco.version> <jacoco.version>0.8.7</jacoco.version>
<jooq.version>3.14.11</jooq.version> <jooq.version>3.14.11</jooq.version>
<opencsv.version>5.4</opencsv.version> <opencsv.version>5.4</opencsv.version>
<javax-rs-api.version>2.1.1</javax-rs-api.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -53,6 +54,11 @@ ...@@ -53,6 +54,11 @@
<artifactId>spring-cloud-starter-bootstrap</artifactId> <artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>${spring-cloud.version}</version> <version>${spring-cloud.version}</version>
</dependency> </dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${javax-rs-api.version}</version>
</dependency>
<!-- Entities and API --> <!-- Entities and API -->
<dependency> <dependency>
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
......
...@@ -15,7 +15,7 @@ spring: ...@@ -15,7 +15,7 @@ spring:
name: fda-citation-service name: fda-citation-service
cloud: cloud:
loadbalancer.ribbon.enabled: false loadbalancer.ribbon.enabled: false
server.port: 9094 server.port: 9096
logging: logging:
pattern.console: "%d %highlight(%-5level) %msg%n" pattern.console: "%d %highlight(%-5level) %msg%n"
level: level:
......
...@@ -15,7 +15,7 @@ spring: ...@@ -15,7 +15,7 @@ spring:
name: fda-citation-service name: fda-citation-service
cloud: cloud:
loadbalancer.ribbon.enabled: false loadbalancer.ribbon.enabled: false
server.port: 9094 server.port: 9096
logging: logging:
pattern.console: "%d %highlight(%-5level) %msg%n" pattern.console: "%d %highlight(%-5level) %msg%n"
level: level:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment