From acc8f4395bcf07b51713a6adf823dd8ef321b3f5 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 27 Sep 2021 14:28:15 +0200
Subject: [PATCH] added dotenv, fixed some runtime ploblems, reduced
elasticsearch output
Former-commit-id: 07fec9c5d1f8fbab643ba40bfc8834ccb655326b
---
.env | 2 ++
docker-compose.yml | 7 +++----
fda-citation-service/pom.xml | 6 ++++++
.../rest-service/src/main/resources/application-docker.yml | 2 +-
.../rest-service/src/main/resources/application.yml | 2 +-
5 files changed, 13 insertions(+), 6 deletions(-)
create mode 100644 .env
diff --git a/.env b/.env
new file mode 100644
index 0000000000..85c810bb81
--- /dev/null
+++ b/.env
@@ -0,0 +1,2 @@
+# Sandbox, normally we need to remove this
+ZENODO_API_KEY=OjphEf9axmjOxPqe419sTkhlVKZKA335NH5OGw0g4DyRUSd0LMryNtjNWg7x
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 583cef7ce9..bc416d0582 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -175,11 +175,9 @@ services:
- fda-public
environment:
SPRING_PROFILES_ACTIVE: docker
+ ZENODO_API_KEY: "${ZENODO_API_KEY}"
ports:
- - 9094:9094
- volumes:
- - /var/run/docker.sock:/var/run/docker.sock
- - /tmp:/tmp
+ - 9096:9096
depends_on:
fda-metadata-db:
condition: service_healthy
@@ -237,6 +235,7 @@ services:
environment:
- discovery.type=single-node
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+ - logger.level=WARN
ports:
- 9200:9200
- 9600:9600
diff --git a/fda-citation-service/pom.xml b/fda-citation-service/pom.xml
index c119eaf38d..dd504512c9 100644
--- a/fda-citation-service/pom.xml
+++ b/fda-citation-service/pom.xml
@@ -33,6 +33,7 @@
<jacoco.version>0.8.7</jacoco.version>
<jooq.version>3.14.11</jooq.version>
<opencsv.version>5.4</opencsv.version>
+ <javax-rs-api.version>2.1.1</javax-rs-api.version>
</properties>
<dependencies>
@@ -53,6 +54,11 @@
<artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>${spring-cloud.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>${javax-rs-api.version}</version>
+ </dependency>
<!-- Entities and API -->
<dependency>
<groupId>at.tuwien</groupId>
diff --git a/fda-citation-service/rest-service/src/main/resources/application-docker.yml b/fda-citation-service/rest-service/src/main/resources/application-docker.yml
index b337d9bcb0..a7a4a410d8 100644
--- a/fda-citation-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-citation-service/rest-service/src/main/resources/application-docker.yml
@@ -15,7 +15,7 @@ spring:
name: fda-citation-service
cloud:
loadbalancer.ribbon.enabled: false
-server.port: 9094
+server.port: 9096
logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
diff --git a/fda-citation-service/rest-service/src/main/resources/application.yml b/fda-citation-service/rest-service/src/main/resources/application.yml
index e6d8210e9b..affe3fa08d 100644
--- a/fda-citation-service/rest-service/src/main/resources/application.yml
+++ b/fda-citation-service/rest-service/src/main/resources/application.yml
@@ -15,7 +15,7 @@ spring:
name: fda-citation-service
cloud:
loadbalancer.ribbon.enabled: false
-server.port: 9094
+server.port: 9096
logging:
pattern.console: "%d %highlight(%-5level) %msg%n"
level:
--
GitLab