fix: improve mount path check (#519)

* fix: refactor file path handling in HasChanged* functions for improved clarity

* fix: add debug logging for commit comparison in deployment handlers

* fix: refactor file change detection logic for improved clarity and accuracy

* fix: update polling configuration for test branch and adjust interval

* fix: add trigger event parameter to DeployStack and update related logic

* fix: improve logging for mounted file changes and enhance error handling in project file checks

* fix: enhance error handling in stack deployment tests

* fix: check only in compose mode for file changes
Swarm mode always force recreates stacks during deployment

* fix: add dependency on proxy service in compose configuration

Author: kimdre

cmd/doco-cd/http_handler.go

@@ -363,6 +363,10 @@ func HandleEvent(ctx context.Context, jobLog *slog.Logger, w http.ResponseWriter
 				return
 			}
 
+			subJobLog.Debug("comparing commits",
+				slog.String("deployed_commit", deployedCommit),
+				slog.String("latest_commit", latestCommit))
+
 			var changedFiles []git.ChangedFile
 			if deployedCommit != "" {
 				changedFiles, err = git.GetChangedFilesBetweenCommits(repo, plumbing.NewHash(deployedCommit), plumbing.NewHash(latestCommit))
@@ -396,7 +400,7 @@ func HandleEvent(ctx context.Context, jobLog *slog.Logger, w http.ResponseWriter
 			}
 
 			err = docker.DeployStack(subJobLog, internalRepoPath, externalRepoPath, &ctx, &dockerCli, dockerClient,
-				&payload, deployConfig, changedFiles, latestCommit, Version, false)
+				&payload, deployConfig, changedFiles, latestCommit, Version, "webhook", false)
 			if err != nil {
 				onError(repoName, w, subJobLog.With(logger.ErrAttr(err)), "deployment failed", err.Error(), jobID, http.StatusInternalServerError)
 

cmd/doco-cd/poll_handler.go

@@ -417,6 +417,10 @@ func RunPoll(ctx context.Context, pollConfig config.PollConfig, appConfig *confi
 				return fmt.Errorf("%w: %s: skipping deployment", ErrDeploymentConflict, deployConfig.Name)
 			}
 
+			subJobLog.Debug("comparing commits",
+				slog.String("deployed_commit", deployedCommit),
+				slog.String("latest_commit", latestCommit))
+
 			if latestCommit == deployedCommit {
 				subJobLog.Debug("no new commit found, skipping deployment", slog.String("last_commit", latestCommit))
 
@@ -465,7 +469,7 @@ func RunPoll(ctx context.Context, pollConfig config.PollConfig, appConfig *confi
 			}
 
 			err = docker.DeployStack(subJobLog, internalRepoPath, externalRepoPath, &ctx, &dockerCli, dockerClient,
-				&payload, deployConfig, changedFiles, latestCommit, Version, false)
+				&payload, deployConfig, changedFiles, latestCommit, Version, "poll", false)
 			if err != nil {
 				subJobLog.Error("failed to deploy stack", log.ErrAttr(err))
 

dev.compose.yaml

@@ -1,9 +1,9 @@
 x-poll-config: &poll-config
   POLL_CONFIG: |
     - url: https://github.com/kimdre/doco-cd_tests.git
-      reference: main
-      interval: 15
-      target: "" # "test"
+      reference: test
+      interval: 10
+      target: ""
       private: true
 
 services:
@@ -15,6 +15,8 @@ services:
       args:
         - APP_VERSION=dev
     restart: unless-stopped
+    depends_on:
+      - proxy
     ports:
       - "80:80"
       - "9120:9120"