Merge pull request #6218 from crazy-max/fix-expose-history

dockerfile: fix history config for EXPOSE instruction

Author: tonistiigi

frontend/dockerfile/dockerfile2llb/convert_expose.go

@@ -41,7 +41,7 @@ func dispatchExpose(d *dispatchState, c *instructions.ExposeCommand, opt *dispat
 		d.image.Config.ExposedPorts[p] = struct{}{}
 	}
 
-	return commitToHistory(&d.image, fmt.Sprintf("EXPOSE %v", ps), false, nil, d.epoch)
+	return commitToHistory(&d.image, fmt.Sprintf("EXPOSE %v", psp), false, nil, d.epoch)
 }
 
 type portSpecs struct {

frontend/dockerfile/dockerfile_test.go

@@ -3916,6 +3916,7 @@ COPY --from=base foo2 foo3
 WORKDIR /
 RUN echo bar > foo4
 RUN ["ls"]
+EXPOSE 2375 5000 1234/udp
 `)
 
 	dir := integration.Tmpdir(
@@ -3962,7 +3963,7 @@ RUN ["ls"]
 	// this depends on busybox. should be ok after freezing images
 	require.Equal(t, 4, len(ociimg.RootFS.DiffIDs))
 
-	require.Equal(t, 7, len(ociimg.History))
+	require.Equal(t, 8, len(ociimg.History))
 	require.Contains(t, ociimg.History[2].CreatedBy, "lbl=val")
 	require.Equal(t, true, ociimg.History[2].EmptyLayer)
 	require.NotNil(t, ociimg.History[2].Created)
@@ -3978,6 +3979,9 @@ RUN ["ls"]
 	require.Contains(t, ociimg.History[6].CreatedBy, "RUN ls")
 	require.Equal(t, false, ociimg.History[6].EmptyLayer)
 	require.NotNil(t, ociimg.History[6].Created)
+	require.Contains(t, ociimg.History[7].CreatedBy, "EXPOSE [1234/udp 2375/tcp 5000/tcp]")
+	require.Equal(t, true, ociimg.History[7].EmptyLayer)
+	require.NotNil(t, ociimg.History[7].Created)
 }
 
 // moby/buildkit#5505