Fix Docker Compose relative directory problem (#60)

- 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

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",

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() {