fix: Use unique build name for build and tag

card.go

@@ -17,8 +17,8 @@ import (
 	"github.com/inhies/go-bytesize"
 )
 
-func (p Plugin) writeCard() error {
-	cmd := exec.Command(dockerExe, "inspect", p.Build.Name)
+func (p Plugin) writeCard(buildName string) error {
+	cmd := exec.Command(dockerExe, "inspect", buildName)
 	data, err := cmd.CombinedOutput()
 	if err != nil {
 		return err

docker.go

@@ -195,10 +195,11 @@ func (p Plugin) Exec() error {
 		}
 	}
 
-	cmds = append(cmds, commandBuild(p.Build)) // docker build
+	buildName := getUniqueBuildName(p.Build.Repo, p.Build.Name)
+	cmds = append(cmds, commandBuild(p.Build, buildName)) // docker build
 
 	for _, tag := range p.Build.Tags {
-		cmds = append(cmds, commandTag(p.Build, tag)) // docker tag
+		cmds = append(cmds, commandTag(p.Build, tag, buildName)) // docker tag
 
 		if !p.Dryrun {
 			cmds = append(cmds, commandPush(p.Build, tag)) // docker push
@@ -224,12 +225,12 @@ func (p Plugin) Exec() error {
 	}
 
 	// output the adaptive card
-	if err := p.writeCard(); err != nil {
+	if err := p.writeCard(buildName); err != nil {
 		fmt.Printf("Could not create adaptive card. %s\n", err)
 	}
 
 	if p.ArtifactFile != "" {
-		if digest, err := getDigest(p.Build.Name); err == nil {
+		if digest, err := getDigest(buildName); err == nil {
 			if err = drone.WritePluginArtifactFile(p.Daemon.RegistryType, p.ArtifactFile, p.Daemon.Registry, p.Build.Repo, digest, p.Build.Tags); err != nil {
 				fmt.Printf("failed to write plugin artifact file at path: %s with error: %s\n", p.ArtifactFile, err)
 			}
@@ -243,8 +244,8 @@ func (p Plugin) Exec() error {
 		// clear the slice
 		cmds = nil
 
-		cmds = append(cmds, commandRmi(p.Build.Name)) // docker rmi
-		cmds = append(cmds, commandPrune())           // docker system prune -f
+		cmds = append(cmds, commandRmi(buildName)) // docker rmi
+		cmds = append(cmds, commandPrune())        // docker system prune -f
 
 		for _, cmd := range cmds {
 			cmd.Stdout = os.Stdout
@@ -299,12 +300,12 @@ func commandInfo() *exec.Cmd {
 }
 
 // helper function to create the docker build command.
-func commandBuild(build Build) *exec.Cmd {
+func commandBuild(build Build, buildName string) *exec.Cmd {
 	args := []string{
 		"build",
 		"--rm=true",
 		"-f", build.Dockerfile,
-		"-t", build.Name,
+		"-t", buildName,
 	}
 
 	args = append(args, build.Context)
@@ -461,9 +462,9 @@ func hasProxyBuildArg(build *Build, key string) bool {
 }
 
 // helper function to create the docker tag command.
-func commandTag(build Build, tag string) *exec.Cmd {
+func commandTag(build Build, tag, buildName string) *exec.Cmd {
 	var (
-		source = build.Name
+		source = buildName
 		target = fmt.Sprintf("%s:%s", build.Repo, tag)
 	)
 	return exec.Command(
@@ -582,3 +583,14 @@ func getDigest(buildName string) (string, error) {
 	}
 	return "", errors.New("unable to fetch digest")
 }
+
+func getUniqueBuildName(repo, buildName string) string {
+	var shortenCommitSHA string
+	if len(buildName) <= 8 {
+		shortenCommitSHA = buildName
+	} else {
+		shortenCommitSHA = buildName[:8]
+	}
+	imageName := repo[strings.LastIndex(repo, "/")+1:]
+	return fmt.Sprintf("%s-%s", imageName, shortenCommitSHA)
+}

docker_test.go

@@ -161,7 +161,7 @@ func TestCommandBuild(t *testing.T) {
 		tc := tc
 
 		t.Run(tc.name, func(t *testing.T) {
-			cmd := commandBuild(tc.build)
+			cmd := commandBuild(tc.build, "plugins/drone-docker:latest")
 
 			if !reflect.DeepEqual(cmd.String(), tc.want.String()) {
 				t.Errorf("Got cmd %v, want %v", cmd, tc.want)