forked from toolshed/abra
		
	Compare commits
	
		
			6 Commits
		
	
	
		
			0.4.0-alph
			...
			0.4.1-alph
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 4ba15df9b7 | |||
| 5721b357a2 | |||
| 6140abbcac | |||
| 996255188b | |||
| 11d78234b2 | |||
| c214937e4a | 
| @ -103,7 +103,7 @@ var appLogsCommand = cli.Command{ | |||||||
|  |  | ||||||
| func tailServiceLogs(c *cli.Context, cl *dockerClient.Client, app config.App, serviceName string) error { | func tailServiceLogs(c *cli.Context, cl *dockerClient.Client, app config.App, serviceName string) error { | ||||||
| 	filters := filters.NewArgs() | 	filters := filters.NewArgs() | ||||||
| 	filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName)) | 	filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), serviceName)) | ||||||
|  |  | ||||||
| 	chosenService, err := service.GetService(context.Background(), cl, filters, internal.NoInput) | 	chosenService, err := service.GetService(context.Background(), cl, filters, internal.NoInput) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
|  | |||||||
| @ -8,7 +8,6 @@ import ( | |||||||
| 	"coopcloud.tech/abra/cli/internal" | 	"coopcloud.tech/abra/cli/internal" | ||||||
| 	"coopcloud.tech/abra/pkg/autocomplete" | 	"coopcloud.tech/abra/pkg/autocomplete" | ||||||
| 	"coopcloud.tech/abra/pkg/config" | 	"coopcloud.tech/abra/pkg/config" | ||||||
| 	recipePkg "coopcloud.tech/abra/pkg/recipe" |  | ||||||
| 	"coopcloud.tech/tagcmp" | 	"coopcloud.tech/tagcmp" | ||||||
| 	"github.com/AlecAivazis/survey/v2" | 	"github.com/AlecAivazis/survey/v2" | ||||||
| 	"github.com/go-git/go-git/v5" | 	"github.com/go-git/go-git/v5" | ||||||
| @ -44,10 +43,6 @@ local file system. | |||||||
| 	Action: func(c *cli.Context) error { | 	Action: func(c *cli.Context) error { | ||||||
| 		recipe := internal.ValidateRecipeWithPrompt(c, false) | 		recipe := internal.ValidateRecipeWithPrompt(c, false) | ||||||
|  |  | ||||||
| 		if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil { |  | ||||||
| 			logrus.Fatal(err) |  | ||||||
| 		} |  | ||||||
|  |  | ||||||
| 		mainApp, err := internal.GetMainAppImage(recipe) | 		mainApp, err := internal.GetMainAppImage(recipe) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			logrus.Fatal(err) | 			logrus.Fatal(err) | ||||||
|  | |||||||
| @ -61,6 +61,10 @@ You may invoke this command in "wizard" mode and be prompted for input: | |||||||
| 	Action: func(c *cli.Context) error { | 	Action: func(c *cli.Context) error { | ||||||
| 		recipe := internal.ValidateRecipeWithPrompt(c, true) | 		recipe := internal.ValidateRecipeWithPrompt(c, true) | ||||||
|  |  | ||||||
|  | 		if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil { | ||||||
|  | 			logrus.Fatal(err) | ||||||
|  | 		} | ||||||
|  |  | ||||||
| 		bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch) | 		bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch) | ||||||
| 		if bumpType != 0 { | 		if bumpType != 0 { | ||||||
| 			// a bitwise check if the number is a power of 2 | 			// a bitwise check if the number is a power of 2 | ||||||
|  | |||||||
| @ -1,8 +1,8 @@ | |||||||
| #!/usr/bin/env bash | #!/usr/bin/env bash | ||||||
|  |  | ||||||
| ABRA_VERSION="0.4.0-alpha" | ABRA_VERSION="0.4.1-alpha" | ||||||
| ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$ABRA_VERSION" | ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$ABRA_VERSION" | ||||||
| RC_VERSION="0.4.0-alpha" | RC_VERSION="0.4.1-alpha" | ||||||
| RC_VERSION_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$RC_VERSION" | RC_VERSION_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$RC_VERSION" | ||||||
|  |  | ||||||
| for arg in "$@"; do | for arg in "$@"; do | ||||||
| @ -44,8 +44,17 @@ function install_abra_release { | |||||||
|     exit 1 |     exit 1 | ||||||
|   fi |   fi | ||||||
|  |  | ||||||
|  |   ARCH=$(uname -m) | ||||||
|   PLATFORM=$(uname -s | tr '[:upper:]' '[:lower:]')_$(uname -m) |   if [[ $ARCH =~ "aarch64" ]]; then | ||||||
|  |       ARCH="arm64" | ||||||
|  |   elif [[ $ARCH =~ "armv5l" ]]; then | ||||||
|  |       ARCH="armv5" | ||||||
|  |   elif [[ $ARCH =~ "armv6l" ]]; then | ||||||
|  |       ARCH="armv6" | ||||||
|  |   elif [[ $ARCH =~ "armv7l" ]]; then | ||||||
|  |       ARCH="armv7" | ||||||
|  |   fi | ||||||
|  |   PLATFORM=$(uname -s | tr '[:upper:]' '[:lower:]')_$ARCH | ||||||
|   FILENAME="abra_"$ABRA_VERSION"_"$PLATFORM"" |   FILENAME="abra_"$ABRA_VERSION"_"$PLATFORM"" | ||||||
|   sed_command_rel='s/.*"assets":\[\{[^]]*"name":"'$FILENAME'"[^}]*"browser_download_url":"([^"]*)".*\].*/\1/p' |   sed_command_rel='s/.*"assets":\[\{[^]]*"name":"'$FILENAME'"[^}]*"browser_download_url":"([^"]*)".*\].*/\1/p' | ||||||
|   sed_command_checksums='s/.*"assets":\[\{[^\]*"name":"checksums.txt"[^}]*"browser_download_url":"([^"]*)".*\].*/\1/p' |   sed_command_checksums='s/.*"assets":\[\{[^\]*"name":"checksums.txt"[^}]*"browser_download_url":"([^"]*)".*\].*/\1/p' | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user