apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-05-12 00:32:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Docker Compose relative directory problem (#60)

Browse source 
- Fix Docker Compose relative directory problem
- Added CONFIGDIR environment variable for docker compose
- Correct Pulsar URL defaults for graph utils to be localhost again
This commit is contained in:
cybermaggedon 2024-09-09 22:03:10 +01:00 • committed by GitHub
parent 0ae6feddb0
commit 054ea6c76a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 81 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

8
deploy/docker-compose/tg-launch-azure-cassandra.yaml
View file

@ -69,9 +69,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -176,7 +176,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-azure-neo4j.yaml
View file

@ -52,9 +52,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -177,7 +177,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-bedrock-cassandra.yaml
View file

@ -69,9 +69,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -176,7 +176,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-bedrock-neo4j.yaml
View file

@ -52,9 +52,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -177,7 +177,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-claude-cassandra.yaml
View file

@ -69,9 +69,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -176,7 +176,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-claude-neo4j.yaml
View file

@ -52,9 +52,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -177,7 +177,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-cohere-cassandra.yaml
View file

@ -69,9 +69,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -176,7 +176,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-cohere-neo4j.yaml
View file

@ -52,9 +52,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -177,7 +177,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-ollama-cassandra.yaml
View file

@ -69,9 +69,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -176,7 +176,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-ollama-neo4j.yaml
View file

@ -52,9 +52,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -177,7 +177,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-openai-cassandra.yaml
View file

@ -69,9 +69,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -176,7 +176,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

8
deploy/docker-compose/tg-launch-openai-neo4j.yaml
View file

@ -52,9 +52,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -177,7 +177,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:

12
deploy/docker-compose/tg-launch-vertexai-cassandra.yaml
View file

@ -69,9 +69,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -176,7 +176,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:
@ -673,7 +673,7 @@ services:
image: docker.io/trustgraph/trustgraph-flow:0.10.0
restart: on-failure:100
volumes:
- ./vertexai:/vertexai
- ${CONFIGDIR}/./vertexai:/vertexai
text-completion-rag:
command:
- text-completion-vertexai
@ -704,7 +704,7 @@ services:
image: docker.io/trustgraph/trustgraph-flow:0.10.0
restart: on-failure:100
volumes:
- ./vertexai:/vertexai
- ${CONFIGDIR}/./vertexai:/vertexai
vectorize:
command:
- embeddings-vectorize

12
deploy/docker-compose/tg-launch-vertexai-neo4j.yaml
View file

@ -52,9 +52,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
graph-rag:
command:
- graph-rag
@ -177,7 +177,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
prompt:
command:
@ -674,7 +674,7 @@ services:
image: docker.io/trustgraph/trustgraph-flow:0.10.0
restart: on-failure:100
volumes:
- ./vertexai:/vertexai
- ${CONFIGDIR}/./vertexai:/vertexai
text-completion-rag:
command:
- text-completion-vertexai
@ -705,7 +705,7 @@ services:
image: docker.io/trustgraph/trustgraph-flow:0.10.0
restart: on-failure:100
volumes:
- ./vertexai:/vertexai
- ${CONFIGDIR}/./vertexai:/vertexai
vectorize:
command:
- embeddings-vectorize

8
deploy/docker-compose/tg-storage-cassandra.yaml
View file

@ -33,9 +33,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
init-pulsar:
command:
- sh
@ -70,7 +70,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
pulsar:
command:

8
deploy/docker-compose/tg-storage-neo4j.yaml
View file

@ -16,9 +16,9 @@ services:
restart: on-failure:100
volumes:
- grafana-storage:/var/lib/grafana
- ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ./grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ./grafana/dashboards/:/var/lib/grafana/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/
- ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/
- ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/
init-pulsar:
command:
- sh
@ -71,7 +71,7 @@ services:
- 9090:9090
restart: on-failure:100
volumes:
- ./prometheus:/etc/prometheus/
- ${CONFIGDIR}/prometheus:/etc/prometheus/
- prometheus-data:/prometheus
pulsar:
command:

2
scripts/graph-show
View file

@ -8,7 +8,7 @@ import argparse
import os
from trustgraph.clients.triples_query_client import TriplesQueryClient
default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://pulsar:6650')
default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650')
def show_graph(pulsar):

2
scripts/graph-to-turtle
View file

@ -11,7 +11,7 @@ import rdflib
import io
import sys
default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://pulsar:6650')
default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650')
def show_graph(pulsar):

8
templates/components/grafana.jsonnet
View file

@ -10,7 +10,7 @@ local images = import "values/images.jsonnet";
local vol = engine.volume("prometheus-data").with_size("20G");
local cfgVol = engine.configVolume(
"prometheus-cfg", "./prometheus",
"prometheus-cfg", "prometheus",
{
"prometheus.yml": importstr "prometheus/prometheus.yml",
}
@ -50,7 +50,7 @@ local images = import "values/images.jsonnet";
local vol = engine.volume("grafana-storage").with_size("20G");
local provDashVol = engine.configVolume(
"prov-dash", "./grafana/provisioning/",
"prov-dash", "grafana/provisioning/",
{
"dashboard.yml":
importstr "grafana/provisioning/dashboard.yml",
@ -59,7 +59,7 @@ local images = import "values/images.jsonnet";
);
local provDataVol = engine.configVolume(
"prov-data", "./grafana/provisioning/",
"prov-data", "grafana/provisioning/",
{
"datasource.yml":
importstr "grafana/provisioning/datasource.yml",
@ -68,7 +68,7 @@ local images = import "values/images.jsonnet";
);
local dashVol = engine.configVolume(
"dashboards", "./grafana/dashboards/",
"dashboards", "grafana/dashboards/",
{
"dashboard.json":
importstr "grafana/dashboards/dashboard.json",

8
templates/engine/docker-compose.jsonnet
View file

@ -78,7 +78,7 @@
(if std.length(container.volumes) > 0 then
{
volumes: [
"%s:%s" % [vol.volume.name, vol.mount]
"%s:%s" % [vol.volume.volid, vol.mount]
for vol in container.volumes
]
}
@ -126,6 +126,8 @@
name: name,
volid:: name,
with_size:: function(size) self + { size: size },
add:: function() {
@ -143,6 +145,8 @@
name: dir,
volid:: "${CONFIGDIR}/" + dir,
with_size:: function(size) self + { size: size },
add:: function() {
@ -157,6 +161,8 @@
name: dir,
volid:: "${CONFIGDIR}/" + dir,
with_size:: function(size) self + { size: size },
add:: function() {