New syntax

.docker-env/config.yml

@@ -16,6 +16,9 @@ compose_file_override: docker-compose.override.yml
 compose_default_profile: app
 compose_sidecar_profile: sidecar
 
+# Git options
+git_default_branch: master
+
 # Debug options
 show_executed_commands: true
 

README.md

@@ -51,7 +51,7 @@ USAGE:
    docker-env [global options] command [command options]
 
 VERSION:
-   1.0.0
+   2.0.0
 
 DESCRIPTION:
    All commands must run in the git repository directory of the project.
@@ -63,7 +63,7 @@ COMMANDS:
    restart, r, reboot          Restart docker containers
    remove, rm, delete          Remove docker containers
    ls, list, l, ll             List projects, 'll' to show containers.
-   cleanup                     Removes all projects
+   reset, cleanup              Removes all projects
    build, b                    Build docker images
    info, config, show          Show configuration
    terminal, term, shell, ssh  Run terminal
@@ -92,23 +92,28 @@ USAGE:
 
 DESCRIPTION:
    Start docker containers.
-   If project name is not specified, current branch name is used.
+   If project name is not specified, master branch is used.
    If project does not exist it will be created.
 
 OPTIONS:
-   --project value, -p value  set a project name
-   --service value, -s value  start a single service
-   --recreate, -r             recreate the containers (default: false)
-   --update, -u               update the images and recreate the containers (default: false)
-   --help, -h                 show help
+   --project value, -p value    set a project name
+   --branch, -b                 use current git branch as project name (default: false)
+   --service value, -s value    start a single service
+   --recreate, -r               recreate the containers (default: false)
+   --update, -u                 update the images and recreate the containers (default: false)
+   --no-hooks, --without-hooks  do not run pre/post start hooks (default: false)
+   --help, -h                   show help
 ```
 
 ## Sample commands
 
 ```
-# Create new environment based on branch name
+# Create new environment with default git branch (master)
 docker-env start
 
+# Create branch based environment
+docker-env start -b
+
 # Create new environment with custom name
 docker-env start -p db-fix
 
@@ -118,6 +123,9 @@ docker-env restart -p db-fix
 # Restart a single container
 docker-env restart -p db-fix -s app
 
+# Restart a single container from active environment
+docker-env restart -s postgresql
+
 # Recreate all containers
 docker-env start -r
 
@@ -131,7 +139,7 @@ docker-env start -u
 docker-env start -s app -u
 
 # Cleanup environments and images
-docker-env cleanup --with-images
+docker-env reset --hard
 
 # Run shell
 docker-env shell
@@ -202,6 +210,9 @@ compose_file_override: docker-compose.override.yml
 compose_default_profile: app
 compose_sidecar_profile: sidecar
 
+# Git options
+git_default_branch: master
+
 # Debug options
 show_executed_commands: true
 
@@ -234,13 +245,16 @@ vscode_binary: code
 
 # Scripts to run before and after
 pre_start_hooks:
-  - .docker-env/pre-start.sh
+  - .docker-env/pre-start.d/10-add-ssl-certificate-linux.sh
+  - .docker-env/pre-start.d/10-add-ssl-certificate-macos.sh
+  - .docker-env/pre-start.d/20-ports.sh
+  - .docker-env/pre-start.d/30-ssh-agent.sh
 
 post_start_hooks:
-  - .docker-env/post-start.sh
+  - .docker-env/post-start.d/10-show-message.sh
 
 post_stop_hooks:
-  - .docker-env/post-stop.sh
+  - .docker-env/post-stop.d/10-node-modules.sh
 
 ```
 

app/context.go

@@ -0,0 +1,60 @@
+package app
+
+import (
+	"github.com/marcinhlybin/docker-env/config"
+	"github.com/marcinhlybin/docker-env/logger"
+	"github.com/marcinhlybin/docker-env/registry"
+	"github.com/urfave/cli/v2"
+)
+
+type AppContext struct {
+	ProjectName      string
+	ServiceName      string
+	IsBranch         bool
+	IsProjectNameSet bool
+	Config           *config.Config
+	Registry         *registry.DockerProjectRegistry
+}
+
+func NewAppContext(c *cli.Context) (*AppContext, error) {
+	cfg, err := initializeConfig(c)
+	if err != nil {
+		return nil, err
+	}
+
+	reg, err := initializeRegistry(cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	// Set default project name
+	projectName := c.String("project")
+	if projectName == "" {
+		projectName = cfg.GitDefaultBranch
+	}
+
+	return &AppContext{
+		ProjectName:      projectName,
+		ServiceName:      c.String("service"),
+		IsProjectNameSet: c.IsSet("project"),
+		IsBranch:         c.Bool("branch"),
+		Config:           cfg,
+		Registry:         reg,
+	}, nil
+}
+
+func initializeConfig(c *cli.Context) (*config.Config, error) {
+	cfg := config.NewConfig()
+	if err := cfg.LoadConfig(c.String("config")); err != nil {
+		return nil, err
+	}
+
+	// Show executed commands
+	logger.ShowExecutedCommands(cfg.ShowExecutedCommands)
+
+	return cfg, nil
+}
+
+func initializeRegistry(cfg *config.Config) (*registry.DockerProjectRegistry, error) {
+	return registry.NewDockerProjectRegistry(cfg), nil
+}

app/project.go

@@ -0,0 +1,43 @@
+package app
+
+import (
+	"github.com/marcinhlybin/docker-env/logger"
+	"github.com/marcinhlybin/docker-env/project"
+)
+
+func (ctx *AppContext) CreateProject() (*project.Project, error) {
+	p, err := project.NewProject(ctx.ProjectName, ctx.ServiceName)
+	if err != nil {
+		return nil, err
+	}
+
+	// Set project name from git branch
+	if ctx.IsBranch {
+		if err := p.SetProjectNameFromGitBranch(); err != nil {
+			return nil, err
+		}
+	}
+
+	return p, nil
+}
+
+func (ctx *AppContext) ActiveProject() (*project.Project, error) {
+	if ctx.IsProjectNameSet {
+		return ctx.CreateProject()
+	}
+
+	// Fetch active project
+	reg := ctx.Registry
+	p, err := reg.ActiveProject()
+	if err != nil {
+		return nil, err
+	}
+
+	if p == nil {
+		logger.Warning("No active project found")
+		return nil, nil
+	}
+
+	p.SetServiceName(ctx.ServiceName)
+	return p, nil
+}

cmd/build.go

@@ -1,6 +1,10 @@
 package cmd
 
 import (
+	"fmt"
+
+	"github.com/marcinhlybin/docker-env/app"
+	"github.com/marcinhlybin/docker-env/project"
 	"github.com/urfave/cli/v2"
 )
 
@@ -9,13 +13,18 @@ var BuildCommand = cli.Command{
 	Aliases: []string{"b"},
 	Usage:   "Build docker images",
 	Description: `Build docker images.
-If environment name is not specified current branch name is used.`,
+If project name is not specified, master branch is used.`,
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:    "project",
 			Aliases: []string{"p"},
 			Usage:   "set a project name",
 		},
+		&cli.BoolFlag{
+			Name:    "branch",
+			Aliases: []string{"b"},
+			Usage:   "use current git branch as project name",
+		},
 		&cli.StringFlag{
 			Name:    "service",
 			Aliases: []string{"s"},
@@ -32,14 +41,34 @@ If environment name is not specified current branch name is used.`,
 func buildAction(c *cli.Context) error {
 	ExitWithErrorOnArgs(c)
 
-	app, err := NewApp(c)
+	// Mutually exclusive flags -p and -b
+	if c.IsSet("project") && c.IsSet("branch") {
+		return fmt.Errorf("flags -p and -b are mutually exclusive")
+	}
+
+	ctx, err := app.NewAppContext(c)
 	if err != nil {
 		return err
 	}
 
-	p, reg := app.Project, app.Registry
+	var p *project.Project
 
-	noCache := c.Bool("no-cache")
+	// Use active project name if no project or branch is specified
+	if !c.IsSet("project") && !c.IsSet("branch") {
+		p, err = ctx.ActiveProject()
+		if err != nil {
+			return err
+		}
+	}
 
-	return reg.BuildProject(p, noCache)
+	// No active project found
+	if p == nil {
+		p, err = ctx.CreateProject()
+		if err != nil {
+			return err
+		}
+	}
+
+	noCache := c.Bool("no-cache")
+	return ctx.Registry.BuildProject(p, noCache)
 }