chore: new release

Closes coop-cloud/organising#180.

.goreleaser.yml

@@ -14,12 +14,12 @@ builds:
     dir: cmd/abra
     goos:
       - linux
+      - darwin
     ldflags:
       - "-X 'main.Commit={{ .Commit }}'"
       - "-X 'main.Version={{ .Version }}'"
 archives:
   - replacements:
-      linux: Linux
       386: i386
       amd64: x86_64
     format: binary
@@ -31,5 +31,10 @@ changelog:
   sort: asc
   filters:
     exclude:
+      - "^WIP:"
+      - "^chore:"
       - "^docs:"
+      - "^refactor:"
+      - "^style:"
       - "^test:"
+      - "^tests:"

cli/app/deploy.go

@@ -31,7 +31,10 @@ var appDeployCommand = &cli.Command{
 		for k, v := range abraShEnv {
 			app.Env[k] = v
 		}
+
+		if _, exists := app.Env["STACK_NAME"]; !exists {
 			app.Env["STACK_NAME"] = app.StackName()
+		}
 
 		composeFiles, err := config.GetAppComposeFiles(app.Type, app.Env)
 		if err != nil {
@@ -39,7 +42,7 @@ var appDeployCommand = &cli.Command{
 		}
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
-			Namespace:    app.StackName(),
+			Namespace:    app.Env["STACK_NAME"],
 			Prune:        false,
 			ResolveImage: stack.ResolveImageAlways,
 		}

cli/catalogue/generate.go

@@ -2,6 +2,7 @@ package catalogue
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"path"
 
@@ -49,7 +50,18 @@ var catalogueGenerateCommand = &cli.Command{
 	Aliases:   []string{"g"},
 	Usage:     "Generate a new copy of the catalogue",
 	ArgsUsage: "[<recipe>]",
-	BashComplete: func(c *cli.Context) {},
+	BashComplete: func(c *cli.Context) {
+		catl, err := catalogue.ReadRecipeCatalogue()
+		if err != nil {
+			logrus.Warn(err)
+		}
+		if c.NArg() > 0 {
+			return
+		}
+		for name := range catl {
+			fmt.Println(name)
+		}
+	},
 	Action: func(c *cli.Context) error {
 		recipeName := c.Args().First()
 
@@ -60,18 +72,18 @@ var catalogueGenerateCommand = &cli.Command{
 
 		logrus.Debugf("ensuring '%v' recipe(s) are locally present and up-to-date", len(repos))
 
-		bar := formatter.CreateProgressbar(len(repos), "retrieving recipes...")
+		retrieveBar := formatter.CreateProgressbar(len(repos), "retrieving recipes...")
 		ch := make(chan string, len(repos))
 		for _, repoMeta := range repos {
 			go func(rm catalogue.RepoMeta) {
 				if recipeName != "" && recipeName != rm.Name {
 					ch <- rm.Name
-					bar.Add(1)
+					retrieveBar.Add(1)
 					return
 				}
 				if _, exists := CatalogueSkipList[rm.Name]; exists {
 					ch <- rm.Name
-					bar.Add(1)
+					retrieveBar.Add(1)
 					return
 				}
 
@@ -86,7 +98,7 @@ var catalogueGenerateCommand = &cli.Command{
 				}
 
 				ch <- rm.Name
-				bar.Add(1)
+				retrieveBar.Add(1)
 			}(repoMeta)
 		}
 
@@ -95,14 +107,23 @@ var catalogueGenerateCommand = &cli.Command{
 		}
 
 		catl := make(catalogue.RecipeCatalogue)
+		catlBar := formatter.CreateProgressbar(len(repos), "generating catalogue...")
 		for _, recipeMeta := range repos {
 			if recipeName != "" && recipeName != recipeMeta.Name {
+				catlBar.Add(1)
 				continue
 			}
+
 			if _, exists := CatalogueSkipList[recipeMeta.Name]; exists {
+				catlBar.Add(1)
 				continue
 			}
 
+			versions, err := catalogue.GetRecipeVersions(recipeMeta.Name)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
 			catl[recipeMeta.Name] = catalogue.RecipeMeta{
 				Name:          recipeMeta.Name,
 				Repository:    recipeMeta.CloneURL,
@@ -110,10 +131,11 @@ var catalogueGenerateCommand = &cli.Command{
 				DefaultBranch: recipeMeta.DefaultBranch,
 				Description:   recipeMeta.Description,
 				Website:       recipeMeta.Website,
-				// Versions:      ..., // FIXME: once the new versions work goes down
+				Versions:      versions,
 				// Category:      ..., // FIXME: once we sort out the machine-readable catalogue interface
 				// Features:      ..., // FIXME: once we figure out the machine-readable catalogue interface
 			}
+			catlBar.Add(1)
 		}
 
 		recipesJSON, err := json.MarshalIndent(catl, "", "    ")
@@ -125,7 +147,7 @@ var catalogueGenerateCommand = &cli.Command{
 			logrus.Fatal(err)
 		}
 
-		logrus.Debugf("generated new recipe catalogue in '%s'", config.APPS_JSON)
+		logrus.Infof("generated new recipe catalogue in '%s'", config.APPS_JSON)
 
 		return nil
 	},

cli/cli.go

@@ -4,11 +4,14 @@ package cli
 import (
 	"fmt"
 	"os"
+	"path"
 
 	"coopcloud.tech/abra/cli/app"
 	"coopcloud.tech/abra/cli/catalogue"
 	"coopcloud.tech/abra/cli/recipe"
 	"coopcloud.tech/abra/cli/server"
+	"coopcloud.tech/abra/pkg/config"
+	logrusStack "github.com/Gurpartap/logrus-stack"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
@@ -76,11 +79,33 @@ func RunApp(version, commit string) {
 	app.Before = func(c *cli.Context) error {
 		if Debug {
 			logrus.SetLevel(logrus.DebugLevel)
-		}
+			logrus.SetFormatter(&logrus.TextFormatter{})
-		return nil
+			logrus.SetOutput(os.Stderr)
+			logrus.AddHook(logrusStack.StandardHook())
 		}
 
-	logrus.Debugf("Flying abra version '%s', commit '%s', enjoy the ride", version, commit)
+		paths := []string{
+			config.ABRA_DIR,
+			path.Join(config.ABRA_DIR, "servers"),
+			path.Join(config.ABRA_DIR, "apps"),
+			path.Join(config.ABRA_DIR, "vendor"),
+		}
+
+		for _, path := range paths {
+			if err := os.Mkdir(path, 0755); err != nil {
+				if !os.IsExist(err) {
+					logrus.Fatal(err)
+				}
+				logrus.Debugf("'%s' already created, moving on...", path)
+				continue
+			}
+			logrus.Debugf("'%s' is missing, creating...", path)
+		}
+
+		logrus.Debugf("abra version '%s', commit '%s'", version, commit)
+
+		return nil
+	}
 
 	if err := app.Run(os.Args); err != nil {
 		logrus.Fatal(err)

cli/recipe/recipe.go

@@ -4,6 +4,30 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
+var Major bool
+var MajorFlag = &cli.BoolFlag{
+	Name:        "major",
+	Value:       false,
+	Aliases:     []string{"ma", "x"},
+	Destination: &Major,
+}
+
+var Minor bool
+var MinorFlag = &cli.BoolFlag{
+	Name:        "minor",
+	Value:       false,
+	Aliases:     []string{"mi", "y"},
+	Destination: &Minor,
+}
+
+var Patch bool
+var PatchFlag = &cli.BoolFlag{
+	Name:        "patch",
+	Value:       false,
+	Aliases:     []string{"p", "z"},
+	Destination: &Patch,
+}
+
 // RecipeCommand defines all recipe related sub-commands.
 var RecipeCommand = &cli.Command{
 	Name:      "recipe",
@@ -18,6 +42,7 @@ Cloud community and you can use Abra to read them and create apps for you.
 	Subcommands: []*cli.Command{
 		recipeListCommand,
 		recipeVersionCommand,
+		recipeReleaseCommand,
 		recipeNewCommand,
 		recipeUpgradeCommand,
 		recipeSyncCommand,

cli/recipe/release.go

@@ -0,0 +1,288 @@
+package recipe
+
+import (
+	"fmt"
+	"path"
+	"strconv"
+	"strings"
+
+	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/recipe"
+	"coopcloud.tech/tagcmp"
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/go-git/go-git/v5/plumbing/object"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli/v2"
+)
+
+var Push bool
+var PushFlag = &cli.BoolFlag{
+	Name:        "push",
+	Value:       false,
+	Destination: &Push,
+}
+
+var Dry bool
+var DryFlag = &cli.BoolFlag{
+	Name:        "dry-run",
+	Value:       false,
+	Aliases:     []string{"d"},
+	Destination: &Dry,
+}
+
+var CommitMessage string
+var CommitMessageFlag = &cli.StringFlag{
+	Name:        "commit-message",
+	Usage:       "commit message. Implies --commit",
+	Aliases:     []string{"cm"},
+	Destination: &CommitMessage,
+}
+
+var Commit bool
+var CommitFlag = &cli.BoolFlag{
+	Name:        "commit",
+	Usage:       "add compose.yml to staging area and commit changes",
+	Value:       false,
+	Aliases:     []string{"c"},
+	Destination: &Commit,
+}
+
+var recipeReleaseCommand = &cli.Command{
+	Name:      "release",
+	Usage:     "tag a recipe",
+	Aliases:   []string{"rl"},
+	ArgsUsage: "<recipe> [<tag>]",
+	Description: `
+This command is used to specify a new tag for a recipe. These tags are used to
+identify different versions of the recipe and are published on the Co-op Cloud
+recipe catalogue.
+
+These tags take the following form:
+
+    a.b.c+x.y.z
+
+Where the "a.b.c" part is maintained as a semantic version of the recipe by the
+recipe maintainer. And the "x.y.z" part is the image tag of the recipe "app"
+service (the main container which contains the software to be used).
+
+We maintain a semantic versioning scheme ("a.b.c") alongside the libre app
+versioning scheme in order to maximise the chances that the nature of recipe
+updates are properly communicated.
+
+Abra does its best to read the "a.b.c" version scheme and communicate what
+action needs to be taken when performing different operations such as an update
+or a rollback of an app.
+`,
+	Flags: []cli.Flag{
+		DryFlag,
+		PatchFlag,
+		MinorFlag,
+		MajorFlag,
+		PushFlag,
+		CommitFlag,
+		CommitMessageFlag,
+	},
+	Action: func(c *cli.Context) error {
+		recipe := internal.ValidateRecipe(c)
+		directory := path.Join(config.APPS_DIR, recipe.Name)
+		tagstring := c.Args().Get(1)
+		imagesTmp := getImageVersions(recipe)
+		mainApp := getMainApp(recipe)
+		mainAppVersion := imagesTmp[mainApp]
+		if mainAppVersion == "" {
+			logrus.Fatal("main app version is empty?")
+		}
+
+		if tagstring != "" {
+			_, err := tagcmp.Parse(tagstring)
+			if err != nil {
+				logrus.Fatal("invalid tag specified")
+			}
+		}
+
+		if Commit || (CommitMessage != "") {
+			commitRepo, err := git.PlainOpen(directory)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			commitWorktree, err := commitRepo.Worktree()
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			if CommitMessage == "" {
+				prompt := &survey.Input{
+					Message: "commit message",
+				}
+				survey.AskOne(prompt, &CommitMessage)
+			}
+			err = commitWorktree.AddGlob("compose.**yml")
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			logrus.Debug("staged compose.**yml for commit")
+
+			_, err = commitWorktree.Commit(CommitMessage, &git.CommitOptions{})
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			logrus.Info("changes commited")
+		}
+
+		repo, err := git.PlainOpen(directory)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		head, err := repo.Head()
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		// bumpType is used to decide what part of the tag should be incremented
+		bumpType := btoi(Major)*4 + btoi(Minor)*2 + btoi(Patch)
+		if bumpType != 0 {
+			// a bitwise check if the number is a power of 2
+			if (bumpType & (bumpType - 1)) != 0 {
+				logrus.Fatal("you can only use one of: --major, --minor, --patch.")
+			}
+		}
+
+		if tagstring != "" {
+			if bumpType > 0 {
+				logrus.Warn("user specified a version number and --major/--minor/--patch at the same time! using version number...")
+			}
+			tag, err := tagcmp.Parse(tagstring)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			if tag.MissingMinor {
+				tag.Minor = "0"
+				tag.MissingMinor = false
+			}
+			if tag.MissingPatch {
+				tag.Patch = "0"
+				tag.MissingPatch = false
+			}
+			tagstring = fmt.Sprintf("%s+%s", tag.String(), mainAppVersion)
+			if Dry {
+				logrus.Info(fmt.Sprintf("dry run only: NOT creating tag %s at %s", tagstring, head.Hash()))
+				return nil
+			}
+
+			repo.CreateTag(tagstring, head.Hash(), nil) /* &git.CreateTagOptions{
+				Message: tag,
+			})*/
+			logrus.Info(fmt.Sprintf("created tag %s at %s", tagstring, head.Hash()))
+			if Push {
+				if err := repo.Push(&git.PushOptions{}); err != nil {
+					logrus.Fatal(err)
+				}
+				logrus.Info(fmt.Sprintf("pushed tag %s to remote", tagstring))
+			}
+
+			return nil
+		}
+
+		// get the latest tag with its hash, name etc
+		var lastGitTag *object.Tag
+		iter, err := repo.Tags()
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		if err := iter.ForEach(func(ref *plumbing.Reference) error {
+			obj, err := repo.TagObject(ref.Hash())
+			if err == nil {
+				lastGitTag = obj
+				return nil
+			}
+			return err
+
+		}); err != nil {
+			logrus.Fatal(err)
+		}
+		newTag, err := tagcmp.Parse(lastGitTag.Name)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
+		var newTagString string
+		if bumpType > 0 {
+			if Patch {
+				now, err := strconv.Atoi(newTag.Patch)
+				if err != nil {
+					logrus.Fatal(err)
+				}
+				newTag.Patch = strconv.Itoa(now + 1)
+			} else if Minor {
+				now, err := strconv.Atoi(newTag.Minor)
+				if err != nil {
+					logrus.Fatal(err)
+				}
+				newTag.Patch = "0"
+				newTag.Minor = strconv.Itoa(now + 1)
+			} else if Major {
+				now, err := strconv.Atoi(newTag.Major)
+				if err != nil {
+					logrus.Fatal(err)
+				}
+				newTag.Patch = "0"
+				newTag.Minor = "0"
+				newTag.Major = strconv.Itoa(now + 1)
+			}
+			newTagString = newTag.String()
+		} else {
+			logrus.Fatal("we don't support automatic tag generation yet - specify a version or use one of: --major --minor --patch")
+		}
+
+		newTagString = fmt.Sprintf("%s+%s", newTagString, mainAppVersion)
+		if Dry {
+			logrus.Info(fmt.Sprintf("dry run only: NOT creating tag %s at %s", newTagString, head.Hash()))
+			return nil
+		}
+
+		repo.CreateTag(newTagString, head.Hash(), nil) /* &git.CreateTagOptions{
+			Message: tag,
+		})*/
+		logrus.Info(fmt.Sprintf("created tag %s at %s", newTagString, head.Hash()))
+		if Push {
+			if err := repo.Push(&git.PushOptions{}); err != nil {
+				logrus.Fatal(err)
+			}
+			logrus.Info(fmt.Sprintf("pushed tag %s to remote", newTagString))
+		}
+
+		return nil
+
+	},
+}
+
+func getImageVersions(recipe recipe.Recipe) map[string]string {
+
+	var services = make(map[string]string)
+	for _, service := range recipe.Config.Services {
+		srv := strings.Split(service.Image, ":")
+		services[srv[0]] = srv[1]
+	}
+
+	return services
+}
+
+func getMainApp(recipe recipe.Recipe) string {
+	for _, service := range recipe.Config.Services {
+		name := service.Name
+		if name == "app" {
+			return strings.Split(service.Image, ":")[0]
+		}
+	}
+	return ""
+}
+
+func btoi(b bool) int {
+	if b {
+		return 1
+	}
+	return 0
+}

cli/recipe/sync.go

@@ -4,61 +4,87 @@ import (
 	"fmt"
 
 	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/client"
+	"coopcloud.tech/abra/pkg/catalogue"
-	"github.com/docker/distribution/reference"
+	"github.com/AlecAivazis/survey/v2"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
 var recipeSyncCommand = &cli.Command{
 	Name:    "sync",
-	Usage:   "Generate new recipe labels",
+	Usage:   "Ensure recipe version labels are up-to-date",
 	Aliases: []string{"s"},
 	Description: `
-This command will generate labels for each service which correspond to the
+This command will generate labels for the main recipe service (i.e. the service
-following format:
+named "app", by convention) which corresponds to the following format:
 
-    coop-cloud.${STACK_NAME}.${SERVICE_NAME}.version=${IMAGE_TAG}-${IMAGE_DIGEST}
+    coop-cloud.${STACK_NAME}.version=${RECIPE_TAG}
 
-The <recipe> configuration will be updated on the local file system. These
+The ${RECIPE_TAG} is determined by the recipe maintainer and is retrieved by
-labels are consumed by abra in other command invocations and used to determine
+this command by asking for the list of git tags on the local git repository.
-the versioning metadata of up-and-running containers are.
+The <recipe> configuration will be updated on the local file system.
 `,
 	ArgsUsage: "<recipe>",
+	BashComplete: func(c *cli.Context) {
+		catl, err := catalogue.ReadRecipeCatalogue()
+		if err != nil {
+			logrus.Warn(err)
+		}
+		if c.NArg() > 0 {
+			return
+		}
+		for name := range catl {
+			fmt.Println(name)
+		}
+	},
 	Action: func(c *cli.Context) error {
 		recipe := internal.ValidateRecipe(c)
 
+		mainService := "app"
+
+		var services []string
 		hasAppService := false
 		for _, service := range recipe.Config.Services {
+			services = append(services, service.Name)
 			if service.Name == "app" {
 				hasAppService = true
+				logrus.Debugf("detected app service in '%s'", recipe.Name)
 			}
 		}
 
 		if !hasAppService {
-			logrus.Fatal(fmt.Sprintf("no 'app' service defined in '%s'", recipe.Name))
+			logrus.Warnf("no 'app' service defined in '%s'", recipe.Name)
+			var chosenService string
+			prompt := &survey.Select{
+				Message: fmt.Sprintf("what is the main service name for '%s'?", recipe.Name),
+				Options: services,
+			}
+			if err := survey.AskOne(prompt, &chosenService); err != nil {
+				logrus.Fatal(err)
+			}
+			mainService = chosenService
 		}
 
-		for _, service := range recipe.Config.Services {
+		logrus.Debugf("selecting '%s' as the service to sync version labels", mainService)
-			img, err := reference.ParseNormalizedNamed(service.Image)
+
+		tags, err := recipe.Tags()
 		if err != nil {
 			logrus.Fatal(err)
 		}
-			logrus.Debugf("detected image '%s' for service '%s'", img, service.Name)
 
-			digest, err := client.GetTagDigest(img)
+		if len(tags) == 0 {
-			if err != nil {
+			logrus.Fatalf("no tags detected for '%s'", recipe.Name)
+		}
+
+		latestTag := tags[len(tags)-1]
+		logrus.Infof("choosing '%s' as latest tag for recipe '%s'", latestTag, recipe.Name)
+
+		label := fmt.Sprintf("coop-cloud.${STACK_NAME}.version=%s", latestTag)
+		if err := recipe.UpdateLabel(mainService, label); err != nil {
 			logrus.Fatal(err)
 		}
-			logrus.Debugf("retrieved digest '%s' for '%s'", digest, img)
 
-			tag := img.(reference.NamedTagged).Tag()
+		logrus.Infof("added label '%s' to service '%s'", label, mainService)
-			label := fmt.Sprintf("coop-cloud.${STACK_NAME}.%s.version=%s-%s", service.Name, tag, digest)
-			if err := recipe.UpdateLabel(service.Name, label); err != nil {
-				logrus.Fatal(err)
-			}
-			logrus.Debugf("added label '%s' to service '%s'", label, service.Name)
-		}
 
 		return nil
 	},

cli/recipe/upgrade.go

@@ -27,20 +27,29 @@ update the relevant compose file tags on the local file system.
 Some image tags cannot be parsed because they do not follow some sort of
 semver-like convention. In this case, all possible tags will be listed and it
 is up to the end-user to decide.
-
-This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
-<recipe>".
 `,
 	ArgsUsage: "<recipe>",
+	Flags: []cli.Flag{
+		PatchFlag,
+		MinorFlag,
+		MajorFlag,
+	},
 	Action: func(c *cli.Context) error {
 		recipe := internal.ValidateRecipe(c)
 
+		bumpType := btoi(Major)*4 + btoi(Minor)*2 + btoi(Patch)
+		if bumpType != 0 {
+			// a bitwise check if the number is a power of 2
+			if (bumpType & (bumpType - 1)) != 0 {
+				logrus.Fatal("you can only use one of: --major, --minor, --patch.")
+			}
+		}
+
 		for _, service := range recipe.Config.Services {
 			catlVersions, err := catalogue.VersionsOfService(recipe.Name, service.Name)
 			if err != nil {
 				logrus.Fatal(err)
 			}
-			logrus.Debugf("read '%s' from the recipe catalogue for '%s'", catlVersions, service.Name)
 
 			img, err := reference.ParseNormalizedNamed(service.Image)
 			if err != nil {
@@ -108,7 +117,24 @@ This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
 			}
 
 			logrus.Debugf("detected compatible upgradable tags '%s' for '%s'", compatibleStrings, service.Name)
-
+			var upgradeTag string
+			if bumpType != 0 {
+				for _, upTag := range compatible {
+					upElement, err := tag.UpgradeElement(upTag)
+					if err != nil {
+						return err
+					}
+					delta := tagcmp.UpgradeType(upElement)
+					if delta <= bumpType {
+						upgradeTag = upTag.String()
+						break
+					}
+				}
+				if upgradeTag == "" {
+					logrus.Warnf("not upgrading from '%s' to '%s' for '%s', because the upgrade type is more serious than what user wants.", tag.String(), compatible[0].String(), image)
+					continue
+				}
+			} else {
 				msg := fmt.Sprintf("upgrade to which tag? (service: %s, tag: %s)", service.Name, tag)
 				if !tagcmp.IsParsable(img.(reference.NamedTagged).Tag()) {
 					tag := img.(reference.NamedTagged).Tag()
@@ -120,7 +146,6 @@ This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
 					}
 				}
 
-			var upgradeTag string
 				prompt := &survey.Select{
 					Message: msg,
 					Options: compatibleStrings,
@@ -128,11 +153,12 @@ This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
 				if err := survey.AskOne(prompt, &upgradeTag); err != nil {
 					logrus.Fatal(err)
 				}
+			}
 
 			if err := recipe.UpdateTag(image, upgradeTag); err != nil {
 				logrus.Fatal(err)
 			}
-			logrus.Debugf("tag updated from '%s' to '%s' for '%s'", image, upgradeTag, recipe.Name)
+			logrus.Infof("tag upgraded from '%s' to '%s' for '%s'", tag.String(), upgradeTag, image)
 		}
 
 		return nil

cli/server/add.go

@@ -2,25 +2,40 @@ package server
 
 import (
 	"context"
+	"errors"
 	"os/user"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/client"
+	"coopcloud.tech/abra/pkg/server"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
+var local bool
+var localFlag = &cli.BoolFlag{
+	Name:        "local",
+	Aliases:     []string{"L"},
+	Value:       false,
+	Usage:       "Set up the local server",
+	Destination: &local,
+}
+
 var serverAddCommand = &cli.Command{
 	Name:  "add",
 	Usage: "Add a new server",
 	Description: `
 This command adds a new server that abra will communicate with, to deploy apps.
 
-The <domain> argument must be a publicy accessible domain name which points to
+If "--local" is passed, then Abra assumes that the current local server is
-your server. You should have SSH access to this server, Abra will assume port
+intended as the target server.
-22 and will use your current system username to make an initial connection. You
+
-can use the <user> and <port> arguments to adjust this.
+Otherwise, you may specify a remote server. The <domain> argument must be a
+publicy accessible domain name which points to your server. You should have SSH
+access to this server, Abra will assume port 22 and will use your current
+system username to make an initial connection. You can use the <user> and
+<port> arguments to adjust this.
 
 For example:
 
@@ -31,12 +46,34 @@ Abra will construct the following SSH connection string then:
     ssh://globemodem@varia.zone:12345
 
 All communication between Abra and the server will use this SSH connection.
-
 `,
 	Aliases: []string{"a"},
+	Flags: []cli.Flag{
+		localFlag,
+	},
 	ArgsUsage: "<domain> [<user>] [<port>]",
 	Action: func(c *cli.Context) error {
-		domainName := internal.ValidateDomain(c)
+		if c.Args().Len() == 1 && !local {
+			err := errors.New("missing arguments <domain> or '--local'")
+			internal.ShowSubcommandHelpAndError(c, err)
+		}
+
+		if c.Args().Get(1) != "" && local {
+			err := errors.New("cannot use '<domain>' and '--local' together")
+			internal.ShowSubcommandHelpAndError(c, err)
+		}
+
+		domainName := "default"
+
+		if local {
+			if err := server.CreateServerDir(domainName); err != nil {
+				logrus.Fatal(err)
+			}
+			logrus.Info("local server has been added")
+			return nil
+		}
+
+		domainName = internal.ValidateDomain(c)
 
 		var username string
 		var port string
@@ -89,6 +126,11 @@ All communication between Abra and the server will use this SSH connection.
 		}
 
 		logrus.Debugf("remote connection to '%s' is definitely up", domainName)
+
+		if err := server.CreateServerDir(domainName); err != nil {
+			logrus.Fatal(err)
+		}
+
 		logrus.Infof("server at '%s' has been added", domainName)
 
 		return nil

cli/server/init.go

@@ -35,6 +35,9 @@ later for more advanced use cases.
 			return err
 		}
 
+		// https://www.privacy-handbuch.de/handbuch_93d.htm
+		freifunkDNS := "5.1.66.255:53"
+
 		resolver := &net.Resolver{
 			PreferGo: false,
 			Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
@@ -42,10 +45,10 @@ later for more advanced use cases.
 					Timeout: time.Millisecond * time.Duration(10000),
 				}
 				// comrade librehosters DNS resolver https://snopyta.org/service/dns/
-				return d.DialContext(ctx, "udp", "95.216.24.230:53")
+				return d.DialContext(ctx, "udp", freifunkDNS)
 			},
 		}
-		logrus.Debugf("created DNS resolver via 95.216.24.230")
+		logrus.Debugf("created DNS resolver via '%s'", freifunkDNS)
 
 		ctx := context.Background()
 		ips, err := resolver.LookupIPAddr(ctx, domainName)

cli/server/list.go

@@ -45,7 +45,11 @@ var serverListCommand = &cli.Command{
 				}
 			}
 			if len(row) == 0 {
-				row = []string{serverName, "UNKNOWN"}
+				if serverName == "default" {
+					row = []string{serverName, "local"}
+				} else {
+					row = []string{serverName, "unknown"}
+				}
 			}
 			table.Append(row)
 		}

go.mod

@@ -3,9 +3,10 @@ module coopcloud.tech/abra
 go 1.17
 
 require (
-	coopcloud.tech/tagcmp v0.0.0-20210906102006-2a8edd82d75d
+	coopcloud.tech/tagcmp v0.0.0-20211003080922-7b06d1c16182
 	github.com/AlecAivazis/survey/v2 v2.3.1
 	github.com/Autonomic-Cooperative/godotenv v1.3.1-0.20210731170023-c37c0920d1a4
+	github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4
 	github.com/docker/cli v20.10.8+incompatible
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/docker v20.10.8+incompatible
@@ -39,6 +40,7 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
 	github.com/fvbommel/sortorder v1.0.2 // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect
 	github.com/go-git/go-billy/v5 v5.3.1 // indirect

go.sum

@@ -23,6 +23,10 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 coopcloud.tech/tagcmp v0.0.0-20210906102006-2a8edd82d75d h1:5jeUIiToqQ7vTlLeycdGp4Ezurd6/RTNl5K38usHtoo=
 coopcloud.tech/tagcmp v0.0.0-20210906102006-2a8edd82d75d/go.mod h1:ESVm0wQKcbcFi06jItF3rI7enf4Jt2PvbkWpDDHk1DQ=
+coopcloud.tech/tagcmp v0.0.0-20211003074705-03d2daced95c h1:7kCjnhjrOevcJeA/koCyyv20E6AglvqC7biGbLzyrbU=
+coopcloud.tech/tagcmp v0.0.0-20211003074705-03d2daced95c/go.mod h1:ESVm0wQKcbcFi06jItF3rI7enf4Jt2PvbkWpDDHk1DQ=
+coopcloud.tech/tagcmp v0.0.0-20211003080922-7b06d1c16182 h1:VGFzudsoGXGRaw5eJE3rErHHUDsmuIJpQkdfKJgrNs4=
+coopcloud.tech/tagcmp v0.0.0-20211003080922-7b06d1c16182/go.mod h1:ESVm0wQKcbcFi06jItF3rI7enf4Jt2PvbkWpDDHk1DQ=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AlecAivazis/survey/v2 v2.3.1 h1:lzkuHA60pER7L4eYL8qQJor4bUWlJe4V0gqAT19tdOA=
 github.com/AlecAivazis/survey/v2 v2.3.1/go.mod h1:TH2kPCDU3Kqq7pLbnCWwZXDBjnhZtmsCle5EiYDJ2fg=
@@ -44,6 +48,8 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4 h1:vdT7QwBhJJEVNFMBNhRSFDRCB6O16T28VhvqRgqFyn8=
+github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4/go.mod h1:SvXOG8ElV28oAiG9zv91SDe5+9PfIr7PPccpr8YyXNs=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@@ -295,6 +301,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
+github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=

pkg/catalogue/catalogue.go

@@ -9,12 +9,17 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
+	"path"
 	"strings"
 	"time"
 
+	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/abra/pkg/web"
+	"github.com/docker/distribution/reference"
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/sirupsen/logrus"
 )
 
@@ -56,6 +61,9 @@ type serviceMeta struct {
 	Tag    string `json:"tag"`
 }
 
+// RecipeVersions are the versions associated with a recipe.
+type RecipeVersions []map[tag]map[service]serviceMeta
+
 // RecipeMeta represents metadata for a recipe in the abra catalogue.
 type RecipeMeta struct {
 	Category      string         `json:"category"`
@@ -65,7 +73,7 @@ type RecipeMeta struct {
 	Icon          string         `json:"icon"`
 	Name          string         `json:"name"`
 	Repository    string         `json:"repository"`
-	Versions      []map[tag]map[service]serviceMeta `json:"versions"`
+	Versions      RecipeVersions `json:"versions"`
 	Website       string         `json:"website"`
 }
 
@@ -365,3 +373,110 @@ func ReadReposMetadata() (RepoCatalogue, error) {
 
 	return reposMeta, nil
 }
+
+// GetRecipeVersions retrieves all recipe versions.
+func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
+	versions := RecipeVersions{}
+
+	recipeDir := path.Join(config.ABRA_DIR, "apps", recipeName)
+
+	logrus.Debugf("attempting to open git repository in '%s'", recipeDir)
+
+	repo, err := git.PlainOpen(recipeDir)
+	if err != nil {
+		return versions, err
+	}
+
+	worktree, err := repo.Worktree()
+	if err != nil {
+		logrus.Fatal(err)
+	}
+
+	gitTags, err := repo.Tags()
+	if err != nil {
+		return versions, err
+	}
+
+	if err := gitTags.ForEach(func(ref *plumbing.Reference) (err error) {
+		tag := strings.TrimPrefix(string(ref.Name()), "refs/tags/")
+
+		logrus.Debugf("processing '%s' for '%s'", tag, recipeName)
+
+		checkOutOpts := &git.CheckoutOptions{
+			Create: false,
+			Force:  true,
+			Keep:   false,
+			Branch: plumbing.ReferenceName(ref.Name()),
+		}
+		if err := worktree.Checkout(checkOutOpts); err != nil {
+			logrus.Debugf("failed to check out '%s' in '%s'", tag, recipeDir)
+			return err
+		}
+
+		logrus.Debugf("successfully checked out '%s' in '%s'", ref.Name(), recipeDir)
+
+		recipe, err := recipe.Get(recipeName)
+		if err != nil {
+			return err
+		}
+
+		versionMeta := make(map[string]serviceMeta)
+		for _, service := range recipe.Config.Services {
+
+			img, err := reference.ParseNormalizedNamed(service.Image)
+			if err != nil {
+				return err
+			}
+
+			path := reference.Path(img)
+			if strings.Contains(path, "library") {
+				path = strings.Split(path, "/")[1]
+			}
+
+			digest, err := client.GetTagDigest(img)
+			if err != nil {
+				return err
+			}
+
+			versionMeta[service.Name] = serviceMeta{
+				Digest: digest,
+				Image:  path,
+				Tag:    img.(reference.NamedTagged).Tag(),
+			}
+
+			logrus.Debugf("collecting digest: '%s', image: '%s', tag: '%s'", digest, path, tag)
+		}
+
+		versions = append(versions, map[string]map[string]serviceMeta{tag: versionMeta})
+
+		return nil
+	}); err != nil {
+		return versions, err
+	}
+
+	branch := "master"
+	if _, err := repo.Branch("master"); err != nil {
+		if _, err := repo.Branch("main"); err != nil {
+			logrus.Debugf("failed to select branch in '%s'", recipeDir)
+			logrus.Fatal(err)
+		}
+		branch = "main"
+	}
+
+	refName := fmt.Sprintf("refs/heads/%s", branch)
+	checkOutOpts := &git.CheckoutOptions{
+		Create: false,
+		Force:  true,
+		Keep:   false,
+		Branch: plumbing.ReferenceName(refName),
+	}
+	if err := worktree.Checkout(checkOutOpts); err != nil {
+		logrus.Debugf("failed to check out '%s' in '%s'", branch, recipeDir)
+		logrus.Fatal(err)
+	}
+
+	logrus.Debugf("switched back to '%s' in '%s'", branch, recipeDir)
+	logrus.Debugf("collected '%s' for '%s'", versions, recipeName)
+
+	return versions, nil
+}

pkg/compose/compose.go

@@ -3,18 +3,20 @@ package compose
 import (
 	"fmt"
 	"io/ioutil"
+	"path"
 	"path/filepath"
 	"strings"
 
 	"coopcloud.tech/abra/pkg/client/stack"
 	loader "coopcloud.tech/abra/pkg/client/stack"
+	"coopcloud.tech/abra/pkg/config"
 	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/distribution/reference"
 	"github.com/sirupsen/logrus"
 )
 
 // UpdateTag updates an image tag in-place on file system local compose files.
-func UpdateTag(pattern, image, tag string) error {
+func UpdateTag(pattern, image, tag, recipeName string) error {
 	composeFiles, err := filepath.Glob(pattern)
 	if err != nil {
 		return err
@@ -24,8 +26,14 @@ func UpdateTag(pattern, image, tag string) error {
 
 	for _, composeFile := range composeFiles {
 		opts := stack.Deploy{Composefiles: []string{composeFile}}
-		emptyEnv := make(map[string]string)
+
-		compose, err := loader.LoadComposefile(opts, emptyEnv)
+		envSamplePath := path.Join(config.ABRA_DIR, "apps", recipeName, ".env.sample")
+		sampleEnv, err := config.ReadEnv(envSamplePath)
+		if err != nil {
+			return err
+		}
+
+		compose, err := loader.LoadComposefile(opts, sampleEnv)
 		if err != nil {
 			return err
 		}
@@ -74,7 +82,7 @@ func UpdateTag(pattern, image, tag string) error {
 }
 
 // UpdateLabel updates a label in-place on file system local compose files.
-func UpdateLabel(pattern, serviceName, label string) error {
+func UpdateLabel(pattern, serviceName, label, recipeName string) error {
 	composeFiles, err := filepath.Glob(pattern)
 	if err != nil {
 		return err
@@ -84,8 +92,14 @@ func UpdateLabel(pattern, serviceName, label string) error {
 
 	for _, composeFile := range composeFiles {
 		opts := stack.Deploy{Composefiles: []string{composeFile}}
-		emptyEnv := make(map[string]string)
+
-		compose, err := loader.LoadComposefile(opts, emptyEnv)
+		envSamplePath := path.Join(config.ABRA_DIR, "apps", recipeName, ".env.sample")
+		sampleEnv, err := config.ReadEnv(envSamplePath)
+		if err != nil {
+			return err
+		}
+
+		compose, err := loader.LoadComposefile(opts, sampleEnv)
 		if err != nil {
 			return err
 		}

pkg/config/app.go

@@ -139,7 +139,7 @@ func LoadAppFiles(servers ...string) (AppFiles, error) {
 		}
 	}
 
-	logrus.Debugf("collecting metadata from '%v' servers: '%s'", len(servers), servers)
+	logrus.Debugf("collecting metadata from '%v' servers: '%s'", len(servers), strings.Join(servers, ", "))
 
 	for _, server := range servers {
 		serverDir := path.Join(ABRA_SERVER_FOLDER, server)

pkg/config/env.go

@@ -73,6 +73,11 @@ func getAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
 	for _, file := range files {
 		// Follow any symlinks
 		filePath := path.Join(directory, file.Name())
+
+		if filepath.Ext(strings.TrimSpace(filePath)) != ".env" {
+			continue
+		}
+
 		realPath, err := filepath.EvalSymlinks(filePath)
 		if err != nil {
 			logrus.Warningf("broken symlink in your abra config folders: '%s'", filePath)
@@ -137,7 +142,7 @@ func ReadAbraShEnvVars(abraSh string) (map[string]string, error) {
 	file, err := os.Open(abraSh)
 	if err != nil {
 		if os.IsNotExist(err) {
-			return envVars, fmt.Errorf("'%s' does not exist?", abraSh)
+			return envVars, nil
 		}
 		return envVars, err
 	}

pkg/config/env_test.go

@@ -13,7 +13,7 @@ var validAbraConf = os.ExpandEnv("$PWD/../../tests/resources/valid_abra_config")
 
 // make sure these are in alphabetical order
 var tFolders = []string{"folder1", "folder2"}
-var tFiles = []string{"bar", "foo"}
+var tFiles = []string{"bar.env", "foo.env"}
 
 var appName = "ecloud"
 var serverName = "evil.corp"

pkg/recipe/recipe.go

@@ -26,7 +26,7 @@ type Recipe struct {
 // UpdateLabel updates a recipe label
 func (r Recipe) UpdateLabel(serviceName, label string) error {
 	pattern := fmt.Sprintf("%s/%s/compose**yml", config.APPS_DIR, r.Name)
-	if err := compose.UpdateLabel(pattern, serviceName, label); err != nil {
+	if err := compose.UpdateLabel(pattern, serviceName, label, r.Name); err != nil {
 		return err
 	}
 	return nil
@@ -35,12 +35,39 @@ func (r Recipe) UpdateLabel(serviceName, label string) error {
 // UpdateTag updates a recipe tag
 func (r Recipe) UpdateTag(image, tag string) error {
 	pattern := fmt.Sprintf("%s/%s/compose**yml", config.APPS_DIR, r.Name)
-	if err := compose.UpdateTag(pattern, image, tag); err != nil {
+	if err := compose.UpdateTag(pattern, image, tag, r.Name); err != nil {
 		return err
 	}
 	return nil
 }
 
+// Tags list the recipe tags
+func (r Recipe) Tags() ([]string, error) {
+	var tags []string
+
+	recipeDir := path.Join(config.ABRA_DIR, "apps", r.Name)
+	repo, err := git.PlainOpen(recipeDir)
+	if err != nil {
+		return tags, err
+	}
+
+	gitTags, err := repo.Tags()
+	if err != nil {
+		return tags, err
+	}
+
+	if err := gitTags.ForEach(func(ref *plumbing.Reference) (err error) {
+		tags = append(tags, strings.TrimPrefix(string(ref.Name()), "refs/tags/"))
+		return nil
+	}); err != nil {
+		return tags, err
+	}
+
+	logrus.Debugf("detected '%s' as tags for recipe '%s'", strings.Join(tags, ", "), r.Name)
+
+	return tags, nil
+}
+
 // Get retrieves a recipe.
 func Get(recipeName string) (Recipe, error) {
 	if err := EnsureExists(recipeName); err != nil {

pkg/server/server.go

@@ -0,0 +1,24 @@
+package server
+
+import (
+	"os"
+	"path"
+
+	"coopcloud.tech/abra/pkg/config"
+	"github.com/sirupsen/logrus"
+)
+
+// CreateServerDir creates a server directory under ~/.abra.
+func CreateServerDir(serverName string) error {
+	serverPath := path.Join(config.ABRA_DIR, "servers", serverName)
+
+	if err := os.Mkdir(serverPath, 0755); err != nil {
+		if !os.IsExist(err) {
+			return err
+		}
+
+		logrus.Infof("'%s' already exists, moving on...", serverPath)
+	}
+
+	return nil
+}

scripts/installer/installer

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ABRA_VERSION="0.1.4-alpha"
+ABRA_VERSION="0.1.7-alpha"
 ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$ABRA_VERSION"
 
 function show_banner {