Skip to content
Snippets Groups Projects

Fixed mapping problem where UK and FK share columns they are inserted

Merged Martin Weise requested to merge dev into master
60 files
+ 220
202
Compare changes
  • Side-by-side
  • Inline

Files

+ 10
10
@@ -109,7 +109,7 @@ services:
@@ -109,7 +109,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-metadata-service
container_name: dbrepo-metadata-service
hostname: metadata-service
hostname: metadata-service
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.5
volumes:
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
environment:
@@ -172,7 +172,7 @@ services:
@@ -172,7 +172,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-analyse-service
container_name: dbrepo-analyse-service
hostname: analyse-service
hostname: analyse-service
image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.5
environment:
environment:
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}
@@ -225,7 +225,7 @@ services:
@@ -225,7 +225,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-search-db
container_name: dbrepo-search-db
hostname: search-db
hostname: search-db
image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.5
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
@@ -249,7 +249,7 @@ services:
@@ -249,7 +249,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-search-service
container_name: dbrepo-search-service
hostname: search-service
hostname: search-service
image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.5
environment:
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -271,7 +271,7 @@ services:
@@ -271,7 +271,7 @@ 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: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.5
environment:
environment:
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -292,7 +292,7 @@ services:
@@ -292,7 +292,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-ui
container_name: dbrepo-ui
hostname: ui
hostname: ui
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.5
environment:
environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}"
@@ -360,7 +360,7 @@ services:
@@ -360,7 +360,7 @@ services:
init: true
init: true
container_name: dbrepo-search-service-init
container_name: dbrepo-search-service-init
hostname: search-service-init
hostname: search-service-init
image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.5
environment:
environment:
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
@@ -414,7 +414,7 @@ services:
@@ -414,7 +414,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-dashboard-service
container_name: dbrepo-dashboard-service
hostname: dashboard-service
hostname: dashboard-service
image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.5
environment:
environment:
LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
@@ -435,7 +435,7 @@ services:
@@ -435,7 +435,7 @@ services:
init: true
init: true
container_name: dbrepo-storage-service-init
container_name: dbrepo-storage-service-init
hostname: storage-service-init
hostname: storage-service-init
image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.5
environment:
environment:
WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}"
WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -475,7 +475,7 @@ services:
@@ -475,7 +475,7 @@ services:
restart: "no"
restart: "no"
container_name: dbrepo-data-service
container_name: dbrepo-data-service
hostname: data-service
hostname: data-service
image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.7
image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.5
volumes:
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
environment:
Loading