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

Merge branch 'dev' into 201-invenio-document-management

parents 91b01dd9 3c1c5d5d
No related branches found
No related tags found
2 merge requests!81New stable release,!80Multiple features connected with user management and ownership of databases
...@@ -4,7 +4,17 @@ target/ ...@@ -4,7 +4,17 @@ target/
!**/src/main/**/target/ !**/src/main/**/target/
!**/src/test/**/target/ !**/src/test/**/target/
.jupyter/ # Notebooks
.jupyter/.idea/
.jupyter/.ipynb_checkpoints
.jupyter/api_authentication
.jupyter/api_broker
.jupyter/api_container
.jupyter/api_database
.jupyter/api_identifier
.jupyter/api_query
.jupyter/api_table
.jupyter/venv
# Environment # Environment
.env .env
......
File added
This diff is collapsed.
...@@ -51,9 +51,6 @@ services: ...@@ -51,9 +51,6 @@ services:
environment: environment:
SPRING_PROFILES_ACTIVE: docker SPRING_PROFILES_ACTIVE: docker
TZ: Europe/Vienna TZ: Europe/Vienna
depends_on:
fda-gateway-service:
condition: service_healthy
ports: ports:
- "9090:9090" - "9090:9090"
logging: logging:
...@@ -72,6 +69,9 @@ services: ...@@ -72,6 +69,9 @@ services:
TZ: Europe/Vienna TZ: Europe/Vienna
ports: ports:
- "9095:9095" - "9095:9095"
depends_on:
fda-discovery-service:
condition: service_healthy
logging: logging:
driver: json-file driver: json-file
......
...@@ -51,9 +51,6 @@ services: ...@@ -51,9 +51,6 @@ services:
environment: environment:
SPRING_PROFILES_ACTIVE: docker SPRING_PROFILES_ACTIVE: docker
TZ: Europe/Vienna TZ: Europe/Vienna
depends_on:
fda-gateway-service:
condition: service_healthy
ports: ports:
- "9090:9090" - "9090:9090"
logging: logging:
...@@ -72,6 +69,9 @@ services: ...@@ -72,6 +69,9 @@ services:
TZ: Europe/Vienna TZ: Europe/Vienna
ports: ports:
- "9095:9095" - "9095:9095"
depends_on:
fda-discovery-service:
condition: service_healthy
logging: logging:
driver: json-file driver: json-file
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment