Merge branch 'main' into jarpsimoes-patch-1

Author: jarpsimoes

src/handlers/default_handlers.go

@@ -28,7 +28,8 @@ func StaticContentHandler(w http.ResponseWriter, r *http.Request) {
 	basePath := utils.BuildBranchPath(repoConfig.GetTargetFolder(), branch)
 
 	if repoConfig.GetRootFolder() != "" {
-		basePath = fmt.Sprintf("%s/%s", basePath, repoConfig.GetRootFolder())
+
+		basePath = fmt.Sprintf("%s/%s", repoConfig.GetRootFolder(), basePath)
 
 		if strings.Contains(basePath, "//") {
 			basePath = strings.ReplaceAll(basePath, "//", "/")

src/utils/environment_config.go

@@ -6,8 +6,6 @@ import (
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
 	"log"
 	"os"
-	"path/filepath"
-	"runtime"
 	"sync"
 	"time"
 )
@@ -54,10 +52,7 @@ var baseRepositoryConfigInstance *BaseRepositoryConfig
 var basicAuthenticationMethod *BasicAuthenticationMethod
 var healthCheckControl *HealthCheckControl
 var pathSecurityCheck *PathSecurityCheck
-var (
-	_, b, _, _ = runtime.Caller(0)
-	basePath   = filepath.Dir(b)
-)
+var basePath, _ = os.Getwd()
 
 // UpdateState [HealthCheckControl] it's a function to update Status
 func (hcc *HealthCheckControl) UpdateState(status bool) {