Remove support for inline dockerfiles (#154)

Author: mrnugget

cmd/src/actions_exec.go

@@ -8,7 +8,6 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -29,11 +28,10 @@ type Action struct {
 }
 
 type ActionStep struct {
-	Type       string   `json:"type"` // "command"
-	Dockerfile string   `json:"dockerfile,omitempty"`
-	Image      string   `json:"image,omitempty"` // Docker image
-	CacheDirs  []string `json:"cacheDirs,omitempty"`
-	Args       []string `json:"args,omitempty"`
+	Type      string   `json:"type"`            // "command"
+	Image     string   `json:"image,omitempty"` // Docker image
+	CacheDirs []string `json:"cacheDirs,omitempty"`
+	Args      []string `json:"args,omitempty"`
 
 	// ImageContentDigest is an internal field that should not be set by users.
 	ImageContentDigest string
@@ -61,21 +59,21 @@ Execute an action on code in repositories. The output of an action is a set of p
 
 Examples:
 
-  Execute an action defined in ~/run-gofmt-in-dockerfile.json:
+  Execute an action defined in ~/run-gofmt.json:
 
-	$ src actions exec -f ~/run-gofmt-in-dockerfile.json
+	$ src actions exec -f ~/run-gofmt.json
 
   Execute an action and create a campaign plan from the patches it produced:
 
-	$ src actions exec -f ~/run-gofmt-in-dockerfile.json -create-plan
+	$ src actions exec -f ~/run-gofmt.json -create-plan
 
   Verbosely execute an action and keep the logs available for debugging:
 
-	$ src -v actions exec -keep-logs -f ~/run-gofmt-in-dockerfile.json
+	$ src -v actions exec -keep-logs -f ~/run-gofmt.json
 
   Execute an action and pipe the patches it produced to 'src campaign plan create-from-patches':
 
-	$ src actions exec -f ~/run-gofmt-in-dockerfile.json | src campaign plan create-from-patches
+	$ src actions exec -f ~/run-gofmt.json | src campaign plan create-from-patches
 
   Read and execute an action definition from standard input:
 
@@ -105,13 +103,13 @@ Format of the action JSON files:
 
 	This action runs a single step over repositories whose name contains "github", building and starting a Docker container based on the image defined through the "dockerfile". In the container the word 'this' is replaced with 'that' in all text files.
 
-
 		{
 		  "scopeQuery": "repo:github",
 		  "steps": [
 		    {
 		      "type": "docker",
-		      "dockerfile": "FROM alpine:3 \n CMD find /work -iname '*.txt' -type f | xargs -n 1 sed -i s/this/that/g"
+		      "image": "alpine:3",
+			  "args": ["sh", "-c", "find /work -iname '*.txt' -type f | xargs -n 1 sed -i s/this/that/g"]
 		    }
 		  ]
 		}
@@ -291,12 +289,8 @@ Format of the action JSON files:
 func validateAction(ctx context.Context, action Action) error {
 	for _, step := range action.Steps {
 		if step.Type == "docker" {
-			if step.Dockerfile == "" && step.Image == "" {
-				return fmt.Errorf("docker run step has to specify either 'image' or 'dockerfile'")
-			}
-
-			if step.Dockerfile != "" && step.Image != "" {
-				return fmt.Errorf("docker run step may specify either image (%q) or dockerfile, not both", step.Image)
+			if step.Image == "" {
+				return fmt.Errorf("docker run step has to specify 'image'")
 			}
 
 			if step.ImageContentDigest != "" {
@@ -314,44 +308,8 @@ func validateAction(ctx context.Context, action Action) error {
 
 func prepareAction(ctx context.Context, action Action) error {
 	// Build any Docker images.
-	for i, step := range action.Steps {
+	for _, step := range action.Steps {
 		if step.Type == "docker" {
-			if step.Dockerfile == "" && step.Image == "" {
-				return fmt.Errorf("docker run step has to specify either 'image' or 'dockerfile'")
-			}
-
-			if step.Dockerfile != "" && step.Image != "" {
-				return fmt.Errorf("docker run step may specify either image (%q) or dockerfile, not both", step.Image)
-			}
-
-			if step.Dockerfile != "" {
-				iidFile, err := ioutil.TempFile("", "src-actions-exec-image-id")
-				if err != nil {
-					return err
-				}
-				defer os.Remove(iidFile.Name())
-
-				if *verbose {
-					log.Printf("Building Docker container for step %d...", i)
-				}
-
-				cmd := exec.CommandContext(ctx, "docker", "build", "--iidfile", iidFile.Name(), "-")
-				cmd.Stdin = strings.NewReader(step.Dockerfile)
-				verboseCmdOutput(cmd)
-				if err := cmd.Run(); err != nil {
-					return errors.Wrap(err, "build docker image")
-				}
-				if *verbose {
-					log.Printf("Done building Docker container for step %d.", i)
-				}
-
-				iid, err := ioutil.ReadFile(iidFile.Name())
-				if err != nil {
-					return err
-				}
-				step.Image = string(iid)
-			}
-
 			// Set digests for Docker images so we don't cache action runs in 2 different images with
 			// the same tag.
 			if step.Image != "" {

cmd/src/actions_exec_backend_runner.go

@@ -165,7 +165,7 @@ func runAction(ctx context.Context, prefix, repoID, repoName, rev string, steps
 			logger.CommandStepDone(repoName, i)
 
 		case "docker":
-			logger.DockerStepStarted(repoName, i, step.Dockerfile, step.Image)
+			logger.DockerStepStarted(repoName, i, step.Image)
 
 			cidFile, err := ioutil.TempFile(tempDirPrefix, prefix+"-container-id")
 			if err != nil {
@@ -242,7 +242,7 @@ func runAction(ctx context.Context, prefix, repoID, repoName, rev string, steps
 	// As of Sourcegraph 3.14 we only support unified diff format.
 	// That means we need to strip away the `a/` and `/b` prefixes with `--no-prefix`.
 	// See: https://github.com/sourcegraph/sourcegraph/blob/82d5e7e1562fef6be5c0b17f18631040fd330835/enterprise/internal/campaigns/service.go#L324-L329
-	// 
+	//
 	diffOut, err := runGitCmd("diff", "--cached", "--no-prefix")
 	if err != nil {
 		return nil, errors.Wrap(err, "git diff failed")

cmd/src/actions_exec_logger.go

@@ -200,12 +200,8 @@ func (a *actionLogger) CommandStepDone(repoName string, step int) {
 	a.write(repoName, yellow, "[Step %d] Done.\n", step)
 }
 
-func (a *actionLogger) DockerStepStarted(repoName string, step int, dockerfile, image string) {
-	var fromDockerfile string
-	if dockerfile != "" {
-		fromDockerfile = " (built from inline Dockerfile)"
-	}
-	a.write(repoName, yellow, "[Step %d] docker run %v%s\n", step, image, fromDockerfile)
+func (a *actionLogger) DockerStepStarted(repoName string, step int, image string) {
+	a.write(repoName, yellow, "[Step %d] docker run %s\n", step, image)
 }
 
 func (a *actionLogger) DockerStepErrored(repoName string, step int, err error, elapsed time.Duration) {