From f847f064d8b0d0911afee84b4337c1026d839aff Mon Sep 17 00:00:00 2001 From: Miroslav Blasko Date: Sat, 25 Nov 2023 13:11:42 +0100 Subject: [PATCH] [New] Share db-server between two docker-compose setups --- deploy/internal-auth/docker-compose.yml | 2 +- deploy/{internal-auth => shared/db-server}/db-server/Dockerfile | 0 .../db-server}/db-server/bin/get-rdf-subject-by-type.py | 0 .../db-server}/db-server/bin/get-value-of-rdf-property.py | 0 .../db-server}/db-server/bin/rdf4j-deploy-context.sh | 0 .../db-server}/db-server/bin/repo-init.sh | 0 .../db-server}/db-server/conf/logback.xml | 0 .../db-server/init-config/record-manager-app-config.ttl | 0 .../db-server/init-config/record-manager-formgen-config.ttl | 0 .../db-server}/db-server/init-data/forms/example-1.ttl | 0 .../db-server}/db-server/init-data/forms/example-2.ttl | 0 11 files changed, 1 insertion(+), 1 deletion(-) rename deploy/{internal-auth => shared/db-server}/db-server/Dockerfile (100%) rename deploy/{internal-auth => shared/db-server}/db-server/bin/get-rdf-subject-by-type.py (100%) rename deploy/{internal-auth => shared/db-server}/db-server/bin/get-value-of-rdf-property.py (100%) rename deploy/{internal-auth => shared/db-server}/db-server/bin/rdf4j-deploy-context.sh (100%) rename deploy/{internal-auth => shared/db-server}/db-server/bin/repo-init.sh (100%) rename deploy/{internal-auth => shared/db-server}/db-server/conf/logback.xml (100%) rename deploy/{internal-auth => shared/db-server}/db-server/init-config/record-manager-app-config.ttl (100%) rename deploy/{internal-auth => shared/db-server}/db-server/init-config/record-manager-formgen-config.ttl (100%) rename deploy/{internal-auth => shared/db-server}/db-server/init-data/forms/example-1.ttl (100%) rename deploy/{internal-auth => shared/db-server}/db-server/init-data/forms/example-2.ttl (100%) diff --git a/deploy/internal-auth/docker-compose.yml b/deploy/internal-auth/docker-compose.yml index dbaeeb7a..20a39b33 100644 --- a/deploy/internal-auth/docker-compose.yml +++ b/deploy/internal-auth/docker-compose.yml @@ -66,7 +66,7 @@ services: db-server: build: - context: ./db-server + context: ../shared/db-server container_name: ${RECORD_SET_NAME:-rm}-db-server environment: GDB_JAVA_OPTS: -Dgraphdb.external-url=http://localhost:$PORT$RECORD_MANAGER_BASENAME/db-server diff --git a/deploy/internal-auth/db-server/Dockerfile b/deploy/shared/db-server/db-server/Dockerfile similarity index 100% rename from deploy/internal-auth/db-server/Dockerfile rename to deploy/shared/db-server/db-server/Dockerfile diff --git a/deploy/internal-auth/db-server/bin/get-rdf-subject-by-type.py b/deploy/shared/db-server/db-server/bin/get-rdf-subject-by-type.py similarity index 100% rename from deploy/internal-auth/db-server/bin/get-rdf-subject-by-type.py rename to deploy/shared/db-server/db-server/bin/get-rdf-subject-by-type.py diff --git a/deploy/internal-auth/db-server/bin/get-value-of-rdf-property.py b/deploy/shared/db-server/db-server/bin/get-value-of-rdf-property.py similarity index 100% rename from deploy/internal-auth/db-server/bin/get-value-of-rdf-property.py rename to deploy/shared/db-server/db-server/bin/get-value-of-rdf-property.py diff --git a/deploy/internal-auth/db-server/bin/rdf4j-deploy-context.sh b/deploy/shared/db-server/db-server/bin/rdf4j-deploy-context.sh similarity index 100% rename from deploy/internal-auth/db-server/bin/rdf4j-deploy-context.sh rename to deploy/shared/db-server/db-server/bin/rdf4j-deploy-context.sh diff --git a/deploy/internal-auth/db-server/bin/repo-init.sh b/deploy/shared/db-server/db-server/bin/repo-init.sh similarity index 100% rename from deploy/internal-auth/db-server/bin/repo-init.sh rename to deploy/shared/db-server/db-server/bin/repo-init.sh diff --git a/deploy/internal-auth/db-server/conf/logback.xml b/deploy/shared/db-server/db-server/conf/logback.xml similarity index 100% rename from deploy/internal-auth/db-server/conf/logback.xml rename to deploy/shared/db-server/db-server/conf/logback.xml diff --git a/deploy/internal-auth/db-server/init-config/record-manager-app-config.ttl b/deploy/shared/db-server/db-server/init-config/record-manager-app-config.ttl similarity index 100% rename from deploy/internal-auth/db-server/init-config/record-manager-app-config.ttl rename to deploy/shared/db-server/db-server/init-config/record-manager-app-config.ttl diff --git a/deploy/internal-auth/db-server/init-config/record-manager-formgen-config.ttl b/deploy/shared/db-server/db-server/init-config/record-manager-formgen-config.ttl similarity index 100% rename from deploy/internal-auth/db-server/init-config/record-manager-formgen-config.ttl rename to deploy/shared/db-server/db-server/init-config/record-manager-formgen-config.ttl diff --git a/deploy/internal-auth/db-server/init-data/forms/example-1.ttl b/deploy/shared/db-server/db-server/init-data/forms/example-1.ttl similarity index 100% rename from deploy/internal-auth/db-server/init-data/forms/example-1.ttl rename to deploy/shared/db-server/db-server/init-data/forms/example-1.ttl diff --git a/deploy/internal-auth/db-server/init-data/forms/example-2.ttl b/deploy/shared/db-server/db-server/init-data/forms/example-2.ttl similarity index 100% rename from deploy/internal-auth/db-server/init-data/forms/example-2.ttl rename to deploy/shared/db-server/db-server/init-data/forms/example-2.ttl