fallback configuration, randomized entrypoint location and general fixes

wabenet · Apr 13, 2018 · e15b401 · e15b401
1 parent c528b57
commit e15b401
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/pkg/container/create.go b/pkg/container/create.go
@@ -39,10 +39,10 @@ func createContainer(ctx context.Context, options Options) (string, error) {
 
 func getEntrypoint(options Options) []string {
 	entrypoint := []string{"/bin/sh"}
-	if len(options.Interpreter) > 0 {
+	if options.Interpreter != nil {
 		entrypoint = options.Interpreter
 	}
-	if !options.Interactive {
+	if !options.Interactive && len(options.Script) > 0 {
 		entrypoint = append(entrypoint, options.Entrypoint)
 	}
 	return entrypoint

diff --git a/pkg/container/entrypoint.go b/pkg/container/entrypoint.go
@@ -48,8 +48,5 @@ func uploadEntrypoint(
 		return err
 	}
 	_, err = tarWriter.Write([]byte(options.Script))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
diff --git a/pkg/container/run.go b/pkg/container/run.go
@@ -74,8 +74,8 @@ func streamContainer(
 		return
 	}
 	defer func() {
-		if err := term.RestoreTerminal(inFd, inState); err != nil {
-			log.Error(err)
+		if restErr := term.RestoreTerminal(inFd, inState); err != nil {
+			log.Error(restErr)
 		}
 	}()
 
@@ -86,8 +86,8 @@ func streamContainer(
 		return
 	}
 	defer func() {
-		if err := term.RestoreTerminal(outFd, outState); err != nil {
-			log.Error(err)
+		if restErr := term.RestoreTerminal(outFd, outState); err != nil {
+			log.Error(restErr)
 		}
 	}()
 

diff --git a/pkg/image/image.go b/pkg/image/image.go
@@ -32,13 +32,13 @@ func Get(ctx context.Context, options Options) (string, error) {
 		return name, nil
 	} else if options.Build != nil {
 		if options.Name != "" {
-			log.Info(fmt.Sprintf("Image %s not found, building...", name))
+			log.Info(fmt.Sprintf("Image %s not found, building...", options.Name))
 		} else {
 			log.Info("Building image...")
 		}
 		return build(ctx, options)
 	} else if options.Name != "" {
-		log.Info(fmt.Sprintf("Image %s not found locally, pulling...", name))
+		log.Info(fmt.Sprintf("Image %s not found locally, pulling...", options.Name))
 		return pull(ctx, options)
 	} else {
 		return "", errors.New("you need to specify either image name or build")