diff --git a/.env.unix.example b/.env.unix.example
index a5413b4849ee8f63908a330c818b7b2d7cc62902..c49d387856617d22c9f58c6249a5134d615aa04b 100644
--- a/.env.unix.example
+++ b/.env.unix.example
@@ -1,6 +1,6 @@
METADATA_DB=fda
-METADATA_USERNAME=postgres
-METADATA_PASSWORD=postgres
+METADATA_USERNAME=root
+METADATA_PASSWORD=dbrepo
BROKER_USERNAME=fda
BROKER_PASSWORD=fda
BROKER_CONSUMERS=2
diff --git a/.env.win.example b/.env.win.example
index db2d3f030a78decff5e7110754740e7c31685f55..cd9cff61cb0a91cd4d1b240678c29db696bbcb74 100644
--- a/.env.win.example
+++ b/.env.win.example
@@ -1,6 +1,6 @@
METADATA_DB=fda
-METADATA_USERNAME=postgres
-METADATA_PASSWORD=postgres
+METADATA_USERNAME=root
+METADATA_PASSWORD=dbrepo
BROKER_USERNAME=fda
BROKER_PASSWORD=fda
BROKER_CONSUMERS=2
diff --git a/docker-compose.yml b/docker-compose.yml
index f93b8721438ac0dad5b201310c5dc2f2e3ccaa96..df03d641e5990cd8b85c106b4ddd4ee0e8b16bea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,6 +43,8 @@ services:
- metadata-db-data:/var/lib/mysql
ports:
- "3306:3306"
+ env_file:
+ - .env
logging:
driver: json-file
@@ -56,6 +58,8 @@ services:
core:
ports:
- "9090:9090"
+ env_file:
+ - .env
environment:
SPRING_PROFILES_ACTIVE: docker
logging:
@@ -73,6 +77,8 @@ services:
SPRING_PROFILES_ACTIVE: docker
ports:
- "9095:9095"
+ env_file:
+ - .env
depends_on:
fda-discovery-service:
condition: service_healthy
@@ -92,6 +98,8 @@ services:
SPRING_PROFILES_ACTIVE: docker
ports:
- "9092:9092"
+ env_file:
+ - .env
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
@@ -116,6 +124,8 @@ services:
SPRING_PROFILES_ACTIVE: docker
ports:
- "9091:9091"
+ env_file:
+ - .env
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
@@ -136,6 +146,8 @@ services:
SPRING_PROFILES_ACTIVE: docker
ports:
- "9097:9097"
+ env_file:
+ - .env
depends_on:
fda-discovery-service:
condition: service_healthy
@@ -157,6 +169,8 @@ services:
userdb:
ports:
- "9093:9093"
+ env_file:
+ - .env
environment:
SPRING_PROFILES_ACTIVE: docker
volumes:
@@ -185,6 +199,8 @@ services:
multipart.location: /tmp
ports:
- "9094:9094"
+ env_file:
+ - .env
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- "/tmp:/tmp"
@@ -210,6 +226,8 @@ services:
SPRING_PROFILES_ACTIVE: docker
ports:
- "9096:9096"
+ env_file:
+ - .env
volumes:
- "/tmp:/tmp"
depends_on:
@@ -232,6 +250,8 @@ services:
SPRING_PROFILES_ACTIVE: docker
ports:
- "9099:9099"
+ env_file:
+ - .env
depends_on:
fda-metadata-db:
condition: service_started
@@ -252,6 +272,8 @@ services:
hostname: analyse-service
ports:
- "5000:5000"
+ env_file:
+ - .env
volumes:
- "/tmp:/tmp"
- /var/run/docker.sock:/var/run/docker.sock
@@ -271,6 +293,8 @@ services:
core:
ports:
- "5010:5010"
+ env_file:
+ - .env
volumes:
- "/tmp:/tmp"
- /var/run/docker.sock:/var/run/docker.sock
@@ -293,6 +317,8 @@ services:
ports:
- "5672:5672"
- "15672:15672"
+ env_file:
+ - .env
depends_on:
fda-discovery-service:
condition: service_healthy
@@ -320,6 +346,8 @@ services:
ports:
- 9200:9200
- 9600:9600
+ env_file:
+ - .env
volumes:
- search-service-data:/usr/share/elasticsearch/data
logging:
@@ -335,6 +363,8 @@ services:
core:
ports:
- "3000:3000"
+ env_file:
+ - .env
volumes:
- "/tmp:/tmp"
depends_on:
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
index 9bd14ae2ff220fbef26cfeddb6b94872d0f4a90d..b2f37baad96a1f3fd3618602309185971becf709 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-local.yml b/fda-authentication-service/rest-service/src/main/resources/application-local.yml
index b9c10d9360e5946b84d3043dcfc20dd5c75efdae..78f06b73390a3dd793d5ae9ee99f3ba421e0642e 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-local.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-authentication-service/rest-service/src/main/resources/application.yml b/fda-authentication-service/rest-service/src/main/resources/application.yml
index a8fb4837e380e828f1fc20ae369ea46510d30f2f..77e0dde1d90f21d6856de698452133ec347faa17 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-container-service/rest-service/src/main/resources/application-docker.yml b/fda-container-service/rest-service/src/main/resources/application-docker.yml
index bff6830b95cdad49e301f033e5a3515d45c540b5..9a58c8b516c57865f776419cbb58367aeb7334cb 100644
--- a/fda-container-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-container-service/rest-service/src/main/resources/application-docker.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-container-service/rest-service/src/main/resources/application-local.yml b/fda-container-service/rest-service/src/main/resources/application-local.yml
index 0e03826a183b6bb5d2416d43bc1fb116c8431892..13b0d446f6fe261b5567a2464802babdc77777fd 100644
--- a/fda-container-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-container-service/rest-service/src/main/resources/application-local.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-container-service/rest-service/src/main/resources/application.yml b/fda-container-service/rest-service/src/main/resources/application.yml
index b9605b4fdd773161b6776596887696ec4c34390e..e23246138ad7d1da2662c846daa8531d0152f4e5 100644
--- a/fda-container-service/rest-service/src/main/resources/application.yml
+++ b/fda-container-service/rest-service/src/main/resources/application.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java b/fda-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java
index eadb36f909a72347ac0a858b5f59aa5d645e6f00..a58f00c227b9e8899bc8ab248c7077c63a5751cc 100644
--- a/fda-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java
+++ b/fda-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java
@@ -71,7 +71,7 @@ public class ContainerServiceImpl implements ContainerService {
/* entity */
final Integer availableTcpPort = SocketUtils.findAvailableTcpPort(10000);
Container container = new Container();
- container.setImage(image.get());
+ container.setImageId(image.get().getId());
container.setPort(availableTcpPort);
container.setName(createDto.getName());
container.setInternalName(containerMapper.containerToInternalContainerName(container));
diff --git a/fda-database-service/rest-service/src/main/resources/application-docker.yml b/fda-database-service/rest-service/src/main/resources/application-docker.yml
index 60f5b8729a62e14c98a01fa490cc36e89d2efe3e..3c1663a1721394c088588d107d904ee7cffd94c1 100644
--- a/fda-database-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-docker.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-database-service/rest-service/src/main/resources/application-local.yml b/fda-database-service/rest-service/src/main/resources/application-local.yml
index bc7fb96365ef4c327d0afa24aa21cf87798a4d65..84337e9e82b2fdf47434bd41220ae5b8f4301b90 100644
--- a/fda-database-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-local.yml
@@ -2,7 +2,7 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:mariadb://metadata-db:3306/fda
+ url: jdbc:mariadb://localhost:3306/fda
driver-class-name: org.mariadb.jdbc.Driver
username: root
password: dbrepo
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
@@ -38,7 +39,7 @@ eureka:
client.serviceUrl.defaultZone: http://localhost:9090/eureka/
fda:
elastic:
- endpoint: search-service:9200
+ endpoint: localhost:9200
username: elastic
password: elastic
ready.path: ./ready
diff --git a/fda-database-service/rest-service/src/main/resources/application.yml b/fda-database-service/rest-service/src/main/resources/application.yml
index c01a4243dff9c4df363662d2a666c8fd54714d80..65c912faef5b4697b0004decbfcaf24584b4de72 100644
--- a/fda-database-service/rest-service/src/main/resources/application.yml
+++ b/fda-database-service/rest-service/src/main/resources/application.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-database-service/services/src/main/java/at/tuwien/service/impl/HibernateConnector.java b/fda-database-service/services/src/main/java/at/tuwien/service/impl/HibernateConnector.java
index 3656f0a6efdc2d0d110f315502e7e795cc02850b..edb6d203d75792fd669dd0e1a29e2b8013a700e6 100644
--- a/fda-database-service/services/src/main/java/at/tuwien/service/impl/HibernateConnector.java
+++ b/fda-database-service/services/src/main/java/at/tuwien/service/impl/HibernateConnector.java
@@ -21,6 +21,9 @@ public abstract class HibernateConnector {
protected static ComboPooledDataSource getDataSource(ContainerImage image, Container container, Database database) {
final ComboPooledDataSource dataSource = new ComboPooledDataSource();
+ log.trace("jdbc method: {}", image.getJdbcMethod());
+ log.trace("jdbc url: {}", container.getInternalName());
+ log.trace("jdbc resource: {}", database != null ? database.getInternalName() : "");
final String url = "jdbc:" + image.getJdbcMethod() + "://" + container.getInternalName() + "/" + (database != null ? database.getInternalName() : "");
dataSource.setJdbcUrl(url);
final String username = image.getEnvironment()
@@ -42,7 +45,6 @@ public abstract class HibernateConnector {
dataSource.setAcquireIncrement(5);
dataSource.setMaxPoolSize(20);
dataSource.setMaxStatements(100);
- log.trace("mapped data source {}", dataSource);
return dataSource;
}
diff --git a/fda-identifier-service/rest-service/src/main/resources/application-docker.yml b/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
index 5465a3c284c06ff501a08f6a4e7d018eb3f3855a..8fe0cad1c4c9cce3f3e225dc53692b2891e8315c 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-identifier-service/rest-service/src/main/resources/application-local.yml b/fda-identifier-service/rest-service/src/main/resources/application-local.yml
index 3211c423196f153a6cc1221bf94b9340c097f3e6..2d089cef27151f0ef9d8c533b6e30bf0ed8cbbe1 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application-local.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-identifier-service/rest-service/src/main/resources/application.yml b/fda-identifier-service/rest-service/src/main/resources/application.yml
index f4004bb81759245e6b866e4a055c0fc1a0c814e6..ccc0ba4a88e4d127c03cbae5d3172adaccbf741c 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
index 22894af699620c8311884e1f7a7958108a3d8eb9..2adde893da745180ca1182a7a93b2dfd6956be80 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
@@ -50,6 +50,9 @@ public class Container {
@Column(nullable = false)
private String hash;
+ @Column(name = "image_id", nullable = false, updatable = false)
+ private Long imageId;
+
@Column
private Integer port;
diff --git a/fda-metadata-db/setup-schema.sql b/fda-metadata-db/setup-schema.sql
index 944a6b9e07a12e20aaca966e755df67182ae66bc..fd90720928ffa979e57c987dfa85ad565aafb904 100644
--- a/fda-metadata-db/setup-schema.sql
+++ b/fda-metadata-db/setup-schema.sql
@@ -88,7 +88,7 @@ CREATE TABLE IF NOT EXISTS mdb_containers
INTERNAL_NAME character varying(255) NOT NULL,
NAME character varying(255) NOT NULL,
PORT integer,
- image_id bigint,
+ image_id bigint NOT NULL,
ip_address character varying(255),
created timestamp NOT NULL DEFAULT NOW(),
created_by bigint NOT NULL,
diff --git a/fda-metadata-service/rest-service/src/main/resources/application-docker.yml b/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
index 99da97687304696dfdbb63ef63fb5ebacb559e1c..f65c5a1e0fc9ebbccf79bbe68dc1544bccb78691 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-metadata-service/rest-service/src/main/resources/application-local.yml b/fda-metadata-service/rest-service/src/main/resources/application-local.yml
index 15bd36425808ac5a56fb1272e6af4dd5e645da3d..819ac55e9fa335700902d2024a41c132f151a811 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application-local.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-metadata-service/rest-service/src/main/resources/application.yml b/fda-metadata-service/rest-service/src/main/resources/application.yml
index 291622e4acb4ba6e23e3fd5865b07b42097753db..e489362136d0bfe62e290aff2884865134f69a21 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-query-service/rest-service/src/main/resources/application-docker.yml b/fda-query-service/rest-service/src/main/resources/application-docker.yml
index 6ea04978aa69a337925ae034f79119f890b07644..c82bd157f2f637f659e2253572a20fc0506fd902 100644
--- a/fda-query-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-query-service/rest-service/src/main/resources/application-docker.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-query-service/rest-service/src/main/resources/application-local.yml b/fda-query-service/rest-service/src/main/resources/application-local.yml
index 5de9ea5ac44a63d8a03fd42f9ec35c25ebe27cda..87c57d456c474971abf91382cc80531e591c4f77 100644
--- a/fda-query-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-query-service/rest-service/src/main/resources/application-local.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-query-service/rest-service/src/main/resources/application.yml b/fda-query-service/rest-service/src/main/resources/application.yml
index 0f84ade3e0c1c1cfe64313d30302821c174bf32b..eaf5448ec24020c764a0bf49a7bc98289059febe 100644
--- a/fda-query-service/rest-service/src/main/resources/application.yml
+++ b/fda-query-service/rest-service/src/main/resources/application.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-table-service/rest-service/src/main/resources/application-docker.yml b/fda-table-service/rest-service/src/main/resources/application-docker.yml
index 51bb0170a062926431b85d1c0dfeb446a7488183..b2a1fbe26e1a853c208c31d778d2a6bcbc84b149 100644
--- a/fda-table-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-table-service/rest-service/src/main/resources/application-docker.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-table-service/rest-service/src/main/resources/application-local.yml b/fda-table-service/rest-service/src/main/resources/application-local.yml
index 99d3153d22311683686b00eaa8bda5bd6bbc4ce7..6e720cd3f502efae0422e417a7bb2048f19edb1e 100644
--- a/fda-table-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-table-service/rest-service/src/main/resources/application-local.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate:
diff --git a/fda-table-service/rest-service/src/main/resources/application.yml b/fda-table-service/rest-service/src/main/resources/application.yml
index 502aa326597a1cf1755e418b0406f55a9464aff8..5428d2c0fbd7f2737545d4c869f163e751759629 100644
--- a/fda-table-service/rest-service/src/main/resources/application.yml
+++ b/fda-table-service/rest-service/src/main/resources/application.yml
@@ -11,6 +11,7 @@ spring:
database-platform: org.hibernate.dialect.MariaDBDialect
hibernate:
ddl-auto: validate
+ use-new-id-generator-mappings: false
open-in-view: false
properties:
hibernate: