update env variables

internal/deploy/deploy.go

@@ -34,11 +34,9 @@ func Deploy(ctx context.Context, configFile string) error {
 		if err := s.Validate(ctx); err != nil {
 			return err
 		}
-		go func(s service.Service) {
-			if err := s.Deploy(ctx); err != nil {
-				fmt.Println("error deploying service", err)
-			}
-		}(s)
+		if err := s.Deploy(ctx); err != nil {
+			fmt.Println("error deploying service", err)
+		}
 	}
 	return nil
 }

internal/service/docker.go

@@ -26,14 +26,14 @@ func (d *dockerService) getContainerConfigs(ctx context.Context) (*container.Con
 	if err != nil {
 		return nil, fmt.Errorf("error parsing port configs: %v", err)
 	}
-	dockerEnvs, err := getDockerEnvConfigs(ctx, d.Env)
+	envsFromFiles, err := parseEnvFiles(ctx, d.EnvFiles)
 	if err != nil {
-		return nil, fmt.Errorf("error getting docker env configs: %v", err)
+		return nil, fmt.Errorf("error parsing env files: %v", err)
 	}
+	envsFromFiles = append(envsFromFiles, d.Env...)
 	return &container.Config{
-		Image: d.Image,
-
-		Env:          dockerEnvs,
+		Image:        d.Image,
+		Env:          envsFromFiles,
 		ExposedPorts: exposedPorts,
 		Labels: map[string]string{
 			"starter": "up",
@@ -75,7 +75,7 @@ func (d *dockerService) deployDocker(ctx context.Context) error {
 
 	var authStr string
 
-	if d.AuthConfig != nil {
+	if d.Auth {
 		authConfigs := registry.AuthConfig{
 			Username: d.AuthConfig.Username,
 			Password: d.AuthConfig.Password,

internal/service/env.go

@@ -1,23 +1,29 @@
 package service
 
 import (
+	"bufio"
 	"context"
-	"fmt"
+	"os"
+	"path"
 	"strings"
 )
 
-func getDockerEnvConfigs(ctx context.Context, env []string) ([]string, error) {
-	dockerEnvs := make([]string, 0)
-	for _, e := range env {
-		for _, envVar := range UpConfigs.Env {
-			envSplit := strings.Split(string(envVar), "=")
-			if len(envSplit) < 2 {
-				fmt.Printf("invalid env variable %s\n", envVar)
-			}
-			if e == envSplit[0] {
-				dockerEnvs = append(dockerEnvs, string(envVar))
+func parseEnvFiles(ctx context.Context, files []string) ([]string, error) {
+	envs := make([]string, 0)
+	for _, f := range files {
+		filePath := path.Join(os.Getenv("PWD"), f)
+		file, err := os.Open(filePath)
+		if err != nil {
+			return nil, err
+		}
+		defer file.Close()
+		scanner := bufio.NewScanner(file)
+		for scanner.Scan() {
+			line := scanner.Text()
+			if strings.Contains(line, "=") {
+				envs = append(envs, line)
 			}
 		}
 	}
-	return dockerEnvs, nil
+	return envs, nil
 }

internal/service/local.go

@@ -3,6 +3,8 @@ package service
 import (
 	"context"
 	"fmt"
+	"os"
+	"path"
 )
 
 func (l *localService) validate(ctx context.Context) error {
@@ -11,15 +13,13 @@ func (l *localService) validate(ctx context.Context) error {
 
 func (l *localService) deployLocal(ctx context.Context) error {
 	fmt.Println("deploying local service", l.Name)
-	envs, err := getDockerEnvConfigs(ctx, l.Env)
-	if err != nil {
-		return err
-	}
 	for _, e := range l.Exec {
+		path := path.Join(os.Getenv("PWD"), l.Path)
+		fmt.Println("running command", e, "in path", path)
 		cmd := CommandConfig{
 			Command:    e,
-			EnvVars:    envs,
-			WorkingDir: l.Path,
+			EnvVars:    l.Env,
+			WorkingDir: path,
 		}
 		if err := cmd.Run(ctx); err != nil {
 			fmt.Println("error running command", err)

internal/service/service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"fmt"
+	"os"
 )
 
 func (s *Service) Validate(ctx context.Context) error {
@@ -15,6 +16,12 @@ func (s *Service) Validate(ctx context.Context) error {
 func (s *Service) Deploy(ctx context.Context) error {
 	switch s.Source {
 	case "docker":
+		if s.Auth && s.AuthConfig == nil {
+			s.AuthConfig = &AuthConfig{
+				Username: os.Getenv("DOCKER_USERNAME"),
+				Password: os.Getenv("DOCKER_PASSWORD"),
+			}
+		}
 		d := &dockerService{
 			Name:          s.Name,
 			ContainerName: s.ContainerName,
@@ -24,7 +31,9 @@ func (s *Service) Deploy(ctx context.Context) error {
 			Pre:           s.Pre,
 			Volumes:       s.Volumes,
 			Networks:      s.Networks,
-			AuthConfig:    s.Auth,
+			Auth:          s.Auth,
+			EnvFiles:      s.EnvFiles,
+			AuthConfig:    s.AuthConfig,
 		}
 		if err := d.validate(ctx); err != nil {
 			return err
@@ -41,8 +50,9 @@ func (s *Service) Deploy(ctx context.Context) error {
 		if err := l.validate(ctx); err != nil {
 			return err
 		}
-		return l.deployLocal(ctx)
+		go l.deployLocal(ctx)
 	default:
 		return fmt.Errorf("unknown source: %s", s.Source)
 	}
+	return nil
 }

internal/service/types.go

@@ -12,12 +12,9 @@ type Service struct {
 	Pre           []string    `yaml:"pre,omitempty"`
 	Exec          []string    `yaml:"exec,omitempty"`
 	Networks      []string    `yaml:"networks,omitempty"`
-	Auth          *authConfig `yaml:"auth,omitempty"`
-}
-
-type authConfig struct {
-	Username string `yaml:"username"`
-	Password string `yaml:"password"`
+	Auth          bool        `yaml:"auth,omitempty"`
+	EnvFiles      []string    `yaml:"env_files,omitempty"`
+	AuthConfig    *AuthConfig `yaml:"auth_config,omitempty"`
 }
 
 type Command struct {
@@ -42,7 +39,9 @@ type dockerService struct {
 	Env           []string
 	Pre           []string
 	Networks      []string
-	AuthConfig    *authConfig
+	Auth          bool
+	EnvFiles      []string
+	AuthConfig    *AuthConfig
 }
 
 type Config struct {
@@ -53,6 +52,11 @@ type Config struct {
 	Deploy   []string         `yaml:"deploy"`
 }
 
+type AuthConfig struct {
+	Username string `yaml:"username"`
+	Password string `yaml:"password"`
+}
+
 type localService struct {
 	Name string
 	Path string