diff --git a/pkg/recipe/compose.go b/pkg/recipe/compose.go index 736e5f70..f8506841 100644 --- a/pkg/recipe/compose.go +++ b/pkg/recipe/compose.go @@ -95,6 +95,7 @@ func (r Recipe) GetVersionLabelLocal() (string, error) { for _, service := range config.Services { for label, value := range service.Deploy.Labels { + log.Debugf("checking deploy label '%s'", label) if strings.HasPrefix(label, "coop-cloud") && strings.Contains(label, "version") { return value, nil } diff --git a/pkg/recipe/git.go b/pkg/recipe/git.go index 7a695fd3..afac7e1e 100644 --- a/pkg/recipe/git.go +++ b/pkg/recipe/git.go @@ -68,6 +68,7 @@ func (r Recipe) EnsureExists() error { // EnsureVersion checks whether a specific version exists for a recipe. func (r Recipe) EnsureVersion(version string) (bool, error) { isChaosCommit := false + log.Debugf("Ensuring version '%s'", version) if err := gitPkg.EnsureGitRepo(r.Dir); err != nil { return isChaosCommit, err @@ -78,7 +79,7 @@ func (r Recipe) EnsureVersion(version string) (bool, error) { return isChaosCommit, err } - tags, err := repo.Tags() + tags, err := repo.References() if err != nil { return isChaosCommit, err } @@ -117,11 +118,11 @@ func (r Recipe) EnsureVersion(version string) (bool, error) { worktree, err := repo.Worktree() if err != nil { - return isChaosCommit, nil + return isChaosCommit, err } if err := worktree.Checkout(opts); err != nil { - return isChaosCommit, nil + return isChaosCommit, err } log.Debugf("successfully checked %s out to %s in %s", r.Name, tagRef.Short(), r.Dir) @@ -216,7 +217,7 @@ func (r Recipe) EnsureUpToDate() error { opts := &git.PullOptions{ Force: true, ReferenceName: branch, - SingleBranch: true, + SingleBranch: false, } if err := worktree.Pull(opts); err != nil {