Skip to content
Snippets Groups Projects

Dev

Closed Martin Weise requested to merge dev into master

Files

@@ -14,7 +14,7 @@ services:
@@ -14,7 +14,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-metadata-db
container_name: dbrepo-metadata-db
hostname: metadata-db
hostname: metadata-db
image: docker.io/dbrepo/metadata-db:latest
image: docker.io/dbrepo/metadata-db:1.4.4
volumes:
volumes:
- metadata-db-data:/bitnami/mariadb
- metadata-db-data:/bitnami/mariadb
- ./dist/2_setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
- ./dist/2_setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
@@ -76,7 +76,7 @@ services:
@@ -76,7 +76,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-auth-service
container_name: dbrepo-auth-service
hostname: auth-service
hostname: auth-service
image: docker.io/dbrepo/auth-service:latest
image: docker.io/dbrepo/auth-service:1.4.4
healthcheck:
healthcheck:
test: curl -sSL 'http://0.0.0.0:8080/realms/dbrepo' | grep "dbrepo" || exit 1
test: curl -sSL 'http://0.0.0.0:8080/realms/dbrepo' | grep "dbrepo" || exit 1
interval: 10s
interval: 10s
@@ -98,18 +98,19 @@ services:
@@ -98,18 +98,19 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-metadata-service
container_name: dbrepo-metadata-service
hostname: metadata-service
hostname: metadata-service
image: docker.io/dbrepo/metadata-service:latest
image: docker.io/dbrepo/metadata-service:1.4.4
volumes:
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
environment:
ADMIN_MAIL: "${ADMIN_MAIL:-noreply@localhost}"
ADMIN_EMAIL: "${ADMIN_EMAIL:-noreply@localhost}"
ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
 
ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://gateway-service}"
AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-fda}
AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-fda}
AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-fda}
AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-fda}
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://gateway-service/api/auth}
BASE_URL: "${BASE_URL:-http://localhost}"
BASE_URL: "${BASE_URL:-http://localhost}"
BROKER_EXCHANGE_NAME: ${BROKER_EXCHANGE_NAME:-dbrepo}
BROKER_EXCHANGE_NAME: ${BROKER_EXCHANGE_NAME:-dbrepo}
BROKER_QUEUE_NAME: ${BROKER_QUEUE_NAME:-dbrepo}
BROKER_QUEUE_NAME: ${BROKER_QUEUE_NAME:-dbrepo}
@@ -121,10 +122,9 @@ services:
@@ -121,10 +122,9 @@ services:
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
DATA_SERVICE_ENDPOINT: ${DATA_SERVICE_ENDPOINT:-http://data-service:8080}
DATA_SERVICE_ENDPOINT: ${DATA_SERVICE_ENDPOINT:-http://data-service:8080}
DELETED_RECORD: "${DELETED_RECORD:-persistent}"
DELETED_RECORD: "${DELETED_RECORD:-persistent}"
GATEWAY_SERVICE_ENDPOINT: ${GATEWAY_SERVICE_ENDPOINT:-http://gateway-service}
GRANULARITY: "${GRANULARITY:-YYYY-MM-DDThh:mm:ssZ}"
GRANULARITY: "${GRANULARITY:-YYYY-MM-DDThh:mm:ssZ}"
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
LOG_LEVEL: ${LOG_LEVEL:-info}
LOG_LEVEL: "${LOG_LEVEL:-info}"
METADATA_DB: "${METADATA_DB:-dbrepo}"
METADATA_DB: "${METADATA_DB:-dbrepo}"
METADATA_HOST: "${METADATA_HOST:-metadata-db}"
METADATA_HOST: "${METADATA_HOST:-metadata-db}"
METADATA_JDBC_EXTRA_ARGS: "${METADATA_JDBC_EXTRA_ARGS:-}"
METADATA_JDBC_EXTRA_ARGS: "${METADATA_JDBC_EXTRA_ARGS:-}"
@@ -132,9 +132,9 @@ services:
@@ -132,9 +132,9 @@ services:
METADATA_PASSWORD: "${METADATA_PASSWORD:-dbrepo}"
METADATA_PASSWORD: "${METADATA_PASSWORD:-dbrepo}"
PID_BASE: ${PID_BASE:-http://localhost/pid/}
PID_BASE: ${PID_BASE:-http://localhost/pid/}
REPOSITORY_NAME: "${REPOSITORY_NAME:-Database Repository}"
REPOSITORY_NAME: "${REPOSITORY_NAME:-Database Repository}"
SEARCH_SERVICE_ENDPOINT: "${SEARCH_SERVICE_ENDPOINT:-http://search-service:8080}"
SEARCH_SERVICE_ENDPOINT: "${SEARCH_SERVICE_ENDPOINT:-http://gateway-service}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://gateway-service/api/storage}"
S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
@@ -160,7 +160,7 @@ services:
@@ -160,7 +160,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-analyse-service
container_name: dbrepo-analyse-service
hostname: analyse-service
hostname: analyse-service
image: docker.io/dbrepo/analyse-service:latest
image: docker.io/dbrepo/analyse-service:1.4.4
environment:
environment:
ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
@@ -211,7 +211,7 @@ services:
@@ -211,7 +211,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-search-db
container_name: dbrepo-search-db
hostname: search-db
hostname: search-db
image: docker.io/dbrepo/search-db:latest
image: docker.io/dbrepo/search-db:1.4.4
healthcheck:
healthcheck:
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
interval: 10s
interval: 10s
@@ -235,7 +235,7 @@ services:
@@ -235,7 +235,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-search-service
container_name: dbrepo-search-service
hostname: search-service
hostname: search-service
image: docker.io/dbrepo/search-service:latest
image: docker.io/dbrepo/search-service:1.4.4
environment:
environment:
ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}"
ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
ADMIN_USERNAME: "${ADMIN_USERNAME:-admin}"
@@ -253,11 +253,12 @@ services:
@@ -253,11 +253,12 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-data-db-sidecar
container_name: dbrepo-data-db-sidecar
hostname: data-db-sidecar
hostname: data-db-sidecar
image: docker.io/dbrepo/data-db-sidecar:latest
image: docker.io/dbrepo/data-db-sidecar:1.4.4
environment:
environment:
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
 
S3_FILE_PATH: "${S3_FILE_PATH:-/tmp}"
S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
volumes:
volumes:
@@ -274,7 +275,7 @@ services:
@@ -274,7 +275,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-ui
container_name: dbrepo-ui
hostname: ui
hostname: ui
image: docker.io/dbrepo/ui:latest
image: docker.io/dbrepo/ui:1.4.4
depends_on:
depends_on:
dbrepo-search-service:
dbrepo-search-service:
condition: service_started
condition: service_started
@@ -318,7 +319,7 @@ services:
@@ -318,7 +319,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-search-service-init
container_name: dbrepo-search-service-init
hostname: search-service-init
hostname: search-service-init
image: docker.io/dbrepo/search-service-init:latest
image: docker.io/dbrepo/search-service-init:1.4.4
environment:
environment:
GATEWAY_SERVICE_ENDPOINT: ${GATEWAY_SERVICE_ENDPOINT:-http://gateway-service}
GATEWAY_SERVICE_ENDPOINT: ${GATEWAY_SERVICE_ENDPOINT:-http://gateway-service}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
@@ -353,7 +354,7 @@ services:
@@ -353,7 +354,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-storage-service-init
container_name: dbrepo-storage-service-init
hostname: storage-service-init
hostname: storage-service-init
image: docker.io/dbrepo/storage-service-init:latest
image: docker.io/dbrepo/storage-service-init:1.4.4
environment:
environment:
SEAWEEDFS_ENDPOINT: "${STORAGE_SEAWEEDFS_ENDPOINT:-storage-service:9333}"
SEAWEEDFS_ENDPOINT: "${STORAGE_SEAWEEDFS_ENDPOINT:-storage-service:9333}"
depends_on:
depends_on:
@@ -390,7 +391,7 @@ services:
@@ -390,7 +391,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-data-service
container_name: dbrepo-data-service
hostname: data-service
hostname: data-service
image: docker.io/dbrepo/data-service:latest
image: docker.io/dbrepo/data-service:1.4.4
volumes:
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
environment:
@@ -411,7 +412,7 @@ services:
@@ -411,7 +412,7 @@ services:
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
CONNECTION_TIMEOUT: ${CONNECTION_TIMEOUT:-60000}
CONNECTION_TIMEOUT: ${CONNECTION_TIMEOUT:-60000}
EXCHANGE_NAME: ${EXCHANGE_NAME:-dbrepo}
EXCHANGE_NAME: ${EXCHANGE_NAME:-dbrepo}
GATEWAY_SERVICE_ENDPOINT: ${GATEWAY_SERVICE_ENDPOINT:-http://gateway-service}
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://gateway-service}
GRANT_DEFAULT_READ: "${GRANT_DEFAULT_READ:-SELECT}"
GRANT_DEFAULT_READ: "${GRANT_DEFAULT_READ:-SELECT}"
GRANT_DEFAULT_WRITE: "${GRANT_DEFAULT_WRITE:-SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE}"
GRANT_DEFAULT_WRITE: "${GRANT_DEFAULT_WRITE:-SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE}"
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
@@ -421,7 +422,12 @@ services:
@@ -421,7 +422,12 @@ services:
QUEUE_NAME: ${QUEUE_NAME:-dbrepo}
QUEUE_NAME: ${QUEUE_NAME:-dbrepo}
REQUEUE_REJECTED: ${REQUEUE_REJECTED:-false}
REQUEUE_REJECTED: ${REQUEUE_REJECTED:-false}
ROUTING_KEY: "${ROUTING_KEY:-dbrepo.#}"
ROUTING_KEY: "${ROUTING_KEY:-dbrepo.#}"
STORAGE_SERVICE_ENDPOINT: ${BROKER_SERVICE_ENDPOINT:-http://storage-service:9000}
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
 
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
 
S3_EXPORT_BUCKET: "${S3_EXPORT_BUCKET:-dbrepo-download}"
 
S3_FILE_PATH: "${S3_FILE_PATH:-/tmp}"
 
S3_IMPORT_BUCKET: "${S3_IMPORT_BUCKET:-dbrepo-upload}"
 
S3_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
healthcheck:
healthcheck:
test: wget -qO- localhost:8080/actuator/health/readiness | grep -q "UP" || exit 1
test: wget -qO- localhost:8080/actuator/health/readiness | grep -q "UP" || exit 1
interval: 10s
interval: 10s
Loading