Skip to content
Snippets Groups Projects
Verified Commit 279dda62 authored by Martin Weise's avatar Martin Weise
Browse files
parent a521d1e0
No related branches found
No related tags found
1 merge request!393Wrong dependencies
...@@ -39,7 +39,6 @@ services: ...@@ -39,7 +39,6 @@ services:
image: docker.io/bitnami/mariadb-galera:11.3.2-debian-12-r9 image: docker.io/bitnami/mariadb-galera:11.3.2-debian-12-r9
volumes: volumes:
- data-db-data:/bitnami/mariadb - data-db-data:/bitnami/mariadb
- "${SHARED_VOLUME:-/tmp}:/tmp"
ports: ports:
- "3307:3306" - "3307:3306"
environment: environment:
...@@ -138,8 +137,6 @@ services: ...@@ -138,8 +137,6 @@ services:
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.7.2 image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.2
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment: environment:
ADMIN_EMAIL: "${ADMIN_EMAIL:-noreply@localhost}" ADMIN_EMAIL: "${ADMIN_EMAIL:-noreply@localhost}"
ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://analyse-service:8080}" ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://analyse-service:8080}"
...@@ -214,8 +211,6 @@ services: ...@@ -214,8 +211,6 @@ services:
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080} METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}" SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}" SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp"
healthcheck: healthcheck:
test: curl -sSL localhost:8080/health | grep 'UP' || exit 1 test: curl -sSL localhost:8080/health | grep 'UP' || exit 1
interval: 10s interval: 10s
...@@ -480,8 +475,6 @@ services: ...@@ -480,8 +475,6 @@ services:
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.7.2 image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.7.2
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment: environment:
AUTH_SERVICE_ADMIN: "${AUTH_SERVICE_ADMIN:-admin}" AUTH_SERVICE_ADMIN: "${AUTH_SERVICE_ADMIN:-admin}"
AUTH_SERVICE_ADMIN_PASSWORD: "${AUTH_SERVICE_ADMIN_PASSWORD:-admin}" AUTH_SERVICE_ADMIN_PASSWORD: "${AUTH_SERVICE_ADMIN_PASSWORD:-admin}"
...@@ -513,7 +506,6 @@ services: ...@@ -513,7 +506,6 @@ services:
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}"
S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}" S3_ENDPOINT: "${S3_ENDPOINT:-http://storage-service:9000}"
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}"
SPARK_USER: "${COMPUTE_SERVICE_USERNAME:-spark}" SPARK_USER: "${COMPUTE_SERVICE_USERNAME:-spark}"
......
[rabbitmq_prometheus,rabbitmq_auth_backend_ldap,rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_mqtt]. [rabbitmq_prometheus,rabbitmq_auth_backend_ldap,rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_mqtt].
\ No newline at end of file
...@@ -302,7 +302,6 @@ ...@@ -302,7 +302,6 @@
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service-entities</artifactId> <artifactId>dbrepo-metadata-service-entities</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -92,6 +92,7 @@ def update_databases() -> None: ...@@ -92,6 +92,7 @@ def update_databases() -> None:
for view in database.views: for view in database.views:
v_old_id: int = view.id v_old_id: int = view.id
v_new_id: uuid = uuid.uuid4() v_new_id: uuid = uuid.uuid4()
plan.append(f"UPDATE mdb_view SET ID = '{v_new_id}' WHERE ID = '{v_old_id}';")
plan.append(f"UPDATE mdb_identifiers SET vid = '{v_new_id}' WHERE vid = '{v_old_id}';") plan.append(f"UPDATE mdb_identifiers SET vid = '{v_new_id}' WHERE vid = '{v_old_id}';")
plan.append(f"UPDATE mdb_view_columns SET id = UUID(), view_id = '{v_new_id}' WHERE id = '{v_old_id}';") plan.append(f"UPDATE mdb_view_columns SET id = UUID(), view_id = '{v_new_id}' WHERE id = '{v_old_id}';")
for table in database.tables: for table in database.tables:
...@@ -101,6 +102,7 @@ def update_databases() -> None: ...@@ -101,6 +102,7 @@ def update_databases() -> None:
plan.append(f"UPDATE mdb_columns SET tID = '{tbl_new_id}' WHERE tID = '{tbl_old_id}';") plan.append(f"UPDATE mdb_columns SET tID = '{tbl_new_id}' WHERE tID = '{tbl_old_id}';")
plan.append(f"UPDATE mdb_constraints_primary_key SET pkid = UUID(), tID = '{tbl_new_id}' WHERE tID = '{tbl_old_id}';") plan.append(f"UPDATE mdb_constraints_primary_key SET pkid = UUID(), tID = '{tbl_new_id}' WHERE tID = '{tbl_old_id}';")
plan.append(f"UPDATE mdb_constraints_unique SET tid = '{tbl_new_id}' WHERE tid = '{tbl_old_id}';") plan.append(f"UPDATE mdb_constraints_unique SET tid = '{tbl_new_id}' WHERE tid = '{tbl_old_id}';")
plan.append(f"UPDATE mdb_constraints_foreign_key SET rtid = '{tbl_new_id}' WHERE rtid = '{tbl_old_id}';")
plan.append( plan.append(
f"UPDATE mdb_constraints_checks SET id = UUID(), tid = '{tbl_new_id}' WHERE tid = '{tbl_old_id}';") f"UPDATE mdb_constraints_checks SET id = UUID(), tid = '{tbl_new_id}' WHERE tid = '{tbl_old_id}';")
for fk in table.constraints.foreign_keys: for fk in table.constraints.foreign_keys:
...@@ -173,6 +175,7 @@ def update_identifiers() -> None: ...@@ -173,6 +175,7 @@ def update_identifiers() -> None:
plan.append(f"UPDATE mdb_identifier_creators SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';") plan.append(f"UPDATE mdb_identifier_creators SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';")
plan.append(f"UPDATE mdb_identifier_funders SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';") plan.append(f"UPDATE mdb_identifier_funders SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';")
plan.append(f"UPDATE mdb_identifier_licenses SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';") plan.append(f"UPDATE mdb_identifier_licenses SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';")
plan.append(f"UPDATE mdb_identifier_related SET pid = '{i_new_id}' WHERE pid = '{i_old_id}';")
for title in identifier.titles: for title in identifier.titles:
t_old_id = title.id t_old_id = title.id
t_new_id: uuid = uuid.uuid4() t_new_id: uuid = uuid.uuid4()
...@@ -189,6 +192,10 @@ def update_identifiers() -> None: ...@@ -189,6 +192,10 @@ def update_identifiers() -> None:
f_old_id = funder.id f_old_id = funder.id
f_new_id: uuid = uuid.uuid4() f_new_id: uuid = uuid.uuid4()
plan.append(f"UPDATE mdb_identifier_funders SET id = '{f_new_id}' WHERE id = '{f_old_id}';") plan.append(f"UPDATE mdb_identifier_funders SET id = '{f_new_id}' WHERE id = '{f_old_id}';")
for funder in identifier.related:
r_old_id = funder.id
r_new_id: uuid = uuid.uuid4()
plan.append(f"UPDATE mdb_identifier_related SET id = '{r_new_id}' WHERE id = '{r_old_id}';")
plan.append("COMMIT;") plan.append("COMMIT;")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment