Merge pull request #839 from antechrestos/fix/upcase_for_from_stage_name

Fix failure when using capital letters in image alias in 'FROM ... AS…' instruction

pkg/dockerfile/dockerfile.go

@@ -203,6 +203,7 @@ func targetStage(stages []instructions.Stage, target string) (int, error) {
 
 // resolveStages resolves any calls to previous stages with names to indices
 // Ex. --from=second_stage should be --from=1 for easier processing later on
+// As third party library lowers stage name in FROM instruction, this function resolves stage case insensitively.
 func resolveStages(stages []instructions.Stage) {
 	nameToIndex := make(map[string]string)
 	for i, stage := range stages {
@@ -214,7 +215,7 @@ func resolveStages(stages []instructions.Stage) {
 			switch c := cmd.(type) {
 			case *instructions.CopyCommand:
 				if c.From != "" {
-					if val, ok := nameToIndex[c.From]; ok {
+					if val, ok := nameToIndex[strings.ToLower(c.From)]; ok {
 						c.From = val
 					}
 

pkg/dockerfile/dockerfile_test.go

@@ -197,8 +197,14 @@ func Test_resolveStages(t *testing.T) {
 	FROM scratch AS second
 	COPY --from=0 /hi /hi2
 	
-	FROM scratch
+	FROM scratch AS tHiRd
 	COPY --from=second /hi2 /hi3
+	COPY --from=1 /hi2 /hi3
+
+	FROM scratch
+	COPY --from=thIrD /hi3 /hi4
+	COPY --from=third /hi3 /hi4
+	COPY --from=2 /hi3 /hi4
 	`
 	stages, _, err := Parse([]byte(dockerfile))
 	if err != nil {
@@ -209,11 +215,14 @@ func Test_resolveStages(t *testing.T) {
 		if index == 0 {
 			continue
 		}
-		copyCmd := stage.Commands[0].(*instructions.CopyCommand)
 		expectedStage := strconv.Itoa(index - 1)
-		if copyCmd.From != expectedStage {
-			t.Fatalf("unexpected copy command: %s resolved to stage %s, expected %s", copyCmd.String(), copyCmd.From, expectedStage)
+		for _, command := range stage.Commands {
+			copyCmd := command.(*instructions.CopyCommand)
+			if copyCmd.From != expectedStage {
+				t.Fatalf("unexpected copy command: %s resolved to stage %s, expected %s", copyCmd.String(), copyCmd.From, expectedStage)
+			}
 		}
+
 	}
 }