From b48ae038fed83df6ded8a8b754f21d0574adbed6 Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Mon, 28 Aug 2023 15:35:35 -0400 Subject: [PATCH 1/3] fix: Notify user to restart docker engine, allow pre-release for docker compose --- cli/cmd/init.go | 2 +- shared/util/preconditions.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cli/cmd/init.go b/cli/cmd/init.go index bf8c3572f6..b76aaa102a 100644 --- a/cli/cmd/init.go +++ b/cli/cmd/init.go @@ -230,7 +230,7 @@ func validateStackNameAvailable(ctx context.Context, stackService *stackservice. if meta.AppName == happyClient.HappyConfig.App() { return nil } - return errors.Errorf("this stack exists, but in a different app ('%s')", meta.AppName) + return errors.Errorf("this stack exists, but in a different app ('%s'), you cannot manipulate it from this app", meta.AppName) } } diff --git a/shared/util/preconditions.go b/shared/util/preconditions.go index ef45a07939..ce216bd5d2 100644 --- a/shared/util/preconditions.go +++ b/shared/util/preconditions.go @@ -10,6 +10,7 @@ import ( "github.com/docker/docker/client" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" + log "github.com/sirupsen/logrus" ) type ValidationCallback = func(context.Context) error @@ -29,6 +30,7 @@ func ValidateEnvironment(ctx context.Context, validations ...ValidationCallback) var errs *multierror.Error for _, validation := range validations { + log.Infof("running validation %v", validation) err := validation(ctx) if err != nil { errs = multierror.Append(errs, err) @@ -63,7 +65,7 @@ func ValidateDockerInstalled(ctx context.Context) error { func ValidateMinDockerComposeVersion(ctx context.Context) error { var errs *multierror.Error - dockerComposeMinVersion, err := semver.NewConstraint(">= v2") + dockerComposeMinVersion, err := semver.NewConstraint(">= v2.0.0-0") if err != nil { return errors.Wrap(err, "could not establish docker compose version") } @@ -130,6 +132,7 @@ func ValidateDockerEngineRunning(ctx context.Context) error { errs = multierror.Append(errs, errors.Wrap(err, "docker engine is not running, follow https://docs.docker.com/get-docker/")) } + log.Debug("checking docker engine is running; if the process freezes up, please restart docker engine") _, err = client.ContainerList(ctx, types.ContainerListOptions{}) if err != nil { errs = multierror.Append(errs, errors.Wrap(err, "cannot connect to docker engine")) From a1f696b27774197c5c02e9e0839021434bd64607 Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Mon, 28 Aug 2023 15:37:01 -0400 Subject: [PATCH 2/3] Remove account id --- examples/nodejs_downstream/backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/nodejs_downstream/backend/Dockerfile b/examples/nodejs_downstream/backend/Dockerfile index f7c2c1771e..f438f0d5d7 100644 --- a/examples/nodejs_downstream/backend/Dockerfile +++ b/examples/nodejs_downstream/backend/Dockerfile @@ -1,6 +1,6 @@ # 1. update this base image tag to update the base image # 2. update this path based on the name of your stack (ie. /stackname/envname/servicename) -FROM 401986845158.dkr.ecr.us-west-2.amazonaws.com/test1/rdev/base:v1.0.1 +FROM ACCOUNTID.dkr.ecr.us-west-2.amazonaws.com/test1/rdev/base:v1.0.1 COPY ./ ./ RUN npm install CMD [ "node", "app.js" ] \ No newline at end of file From 101d4f7e4dea237591d750941f0dc35b283eee2d Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Mon, 28 Aug 2023 15:39:58 -0400 Subject: [PATCH 3/3] Update preconditions.go --- shared/util/preconditions.go | 1 - 1 file changed, 1 deletion(-) diff --git a/shared/util/preconditions.go b/shared/util/preconditions.go index ce216bd5d2..3a05955630 100644 --- a/shared/util/preconditions.go +++ b/shared/util/preconditions.go @@ -30,7 +30,6 @@ func ValidateEnvironment(ctx context.Context, validations ...ValidationCallback) var errs *multierror.Error for _, validation := range validations { - log.Infof("running validation %v", validation) err := validation(ctx) if err != nil { errs = multierror.Append(errs, err)