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

Works partly

parent f66a70f3
No related branches found
No related tags found
4 merge requests!129New module for citation as they occur multiple,!121Modified logging, modified logging level, modified flasgger endpoint,!113Resolve "Bugs related with Query Service",!109Resolve "Use MariaDB for metadata database"
Show whitespace changes
Inline Side-by-side
Showing
with 57 additions and 9 deletions
.env.unix.example
+ 2
− 2
View file @ cb42133a
METADATA_DB=fda
METADATA_USERNAME=postgres
METADATA_PASSWORD=postgres
METADATA_USERNAME=root
METADATA_PASSWORD=dbrepo
BROKER_USERNAME=fda
BROKER_PASSWORD=fda
BROKER_CONSUMERS=2
......
.env.win.example
+ 2
− 2
View file @ cb42133a
METADATA_DB=fda
METADATA_USERNAME=postgres
METADATA_PASSWORD=postgres
METADATA_USERNAME=root
METADATA_PASSWORD=dbrepo
BROKER_USERNAME=fda
BROKER_PASSWORD=fda
BROKER_CONSUMERS=2
......
docker-compose.yml
+ 30
− 0
View file @ cb42133a
......@@ -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:
......
fda-authentication-service/rest-service/src/main/resources/application-docker.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-authentication-service/rest-service/src/main/resources/application-local.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-authentication-service/rest-service/src/main/resources/application.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-container-service/rest-service/src/main/resources/application-docker.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-container-service/rest-service/src/main/resources/application-local.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-container-service/rest-service/src/main/resources/application.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-container-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java
+ 1
− 1
View file @ cb42133a
......@@ -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));
......
fda-database-service/rest-service/src/main/resources/application-docker.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-database-service/rest-service/src/main/resources/application-local.yml
+ 3
− 2
View file @ cb42133a
......@@ -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
......
fda-database-service/rest-service/src/main/resources/application.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-database-service/services/src/main/java/at/tuwien/service/impl/HibernateConnector.java
+ 3
− 1
View file @ cb42133a
......@@ -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;
}
......
fda-identifier-service/rest-service/src/main/resources/application-docker.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-identifier-service/rest-service/src/main/resources/application-local.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-identifier-service/rest-service/src/main/resources/application.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
+ 3
− 0
View file @ cb42133a
......@@ -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;
......
fda-metadata-db/setup-schema.sql
+ 1
− 1
View file @ cb42133a
......@@ -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,
......
fda-metadata-service/rest-service/src/main/resources/application-docker.yml
+ 1
− 0
View file @ cb42133a
......@@ -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:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment