From ac503c5194911e93cfd7651ef27b91139ea2fa73 Mon Sep 17 00:00:00 2001
From: Costa Alexoglou <konstantinos.alexoglou@grafana.com>
Date: Thu, 16 Oct 2025 15:58:00 +0200
Subject: [PATCH] fix: run create_docker_compose.sh from anywhere (#112513)

---
 devenv/create_docker_compose.sh | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/devenv/create_docker_compose.sh b/devenv/create_docker_compose.sh
index 5d1d2a90bb4..21bd7d88055 100755
--- a/devenv/create_docker_compose.sh
+++ b/devenv/create_docker_compose.sh
@@ -9,14 +9,16 @@ blocks_dir="${SCRIPT_DIR}/docker/blocks"
 docker_dir="${SCRIPT_DIR}/docker"
 template_dir="${SCRIPT_DIR}/templates"
 
-grafana_config_file=conf.tmp
+grafana_config_file="${SCRIPT_DIR}/conf.tmp"
 grafana_config=config
 
 compose_header_file="${SCRIPT_DIR}/docker/compose_header.yml"
 compose_volume_section_file="${SCRIPT_DIR}/docker/compose_volume_section.yml"
 compose_volume_section_create_flag=docker_volume_create_true
-compose_file=docker-compose.yaml
-env_file=.env
+compose_file="${SCRIPT_DIR}/docker-compose.yaml"
+compose_file_name="docker-compose.yaml"
+env_file="${SCRIPT_DIR}/.env"
+env_file_name=".env"
 
 if [ "$#" == 0 ]; then
     blocks=`ls $blocks_dir`
@@ -54,16 +56,16 @@ for dir in $@; do
         echo "" >> $grafana_config_file
     fi
 
-    if [ -e $current_dir/$compose_file ]; then
-        echo "Adding $current_dir/$compose_file to $compose_file"
-        cat $current_dir/$compose_file >> $compose_file
+    if [ -e $current_dir/$compose_file_name ]; then
+        echo "Adding $current_dir/$compose_file_name to $compose_file"
+        cat $current_dir/$compose_file_name >> $compose_file
         echo "" >> $compose_file
     fi
 
-    if [ -e $current_dir/$env_file ]; then
-        echo "Adding $current_dir/$env_file to .env"
-        cat $current_dir/$env_file >> .env
-        echo "" >> .env
+    if [ -e $current_dir/$env_file_name ]; then
+        echo "Adding $current_dir/$env_file_name to $env_file"
+        cat $current_dir/$env_file_name >> $env_file
+        echo "" >> $env_file
     fi
 done