Merge pull request containers#6284 from aeijdenberg/ociarchivefailure

fix(build): make --tag oci-archive:xxx.tar work with simple images

Author: openshift-merge-bot[bot]

imagebuildah/stage_executor.go

@@ -2118,12 +2118,19 @@ func (s *StageExecutor) tagExistingImage(ctx context.Context, cacheID, output st
 		return "", nil, fmt.Errorf("getting source imageReference for %q: %w", cacheID, err)
 	}
 	options := cp.Options{
-		RemoveSignatures: true, // more like "ignore signatures", since they don't get removed when src and dest are the same image
+		RemoveSignatures:     true, // more like "ignore signatures", since they don't get removed when src and dest are the same image
+		DestinationTimestamp: s.executor.timestamp,
 	}
 	manifestBytes, err := cp.Image(ctx, policyContext, dest, src, &options)
 	if err != nil {
 		return "", nil, fmt.Errorf("copying image %q: %w", cacheID, err)
 	}
+
+	// If the destination isn't container storage, then we're done and can return early
+	if dest.Transport().Name() != is.Transport.Name() {
+		return cacheID, nil, nil
+	}
+
 	manifestDigest, err := manifest.Digest(manifestBytes)
 	if err != nil {
 		return "", nil, fmt.Errorf("computing digest of manifest for image %q: %w", cacheID, err)

tests/bud.bats

@@ -8074,6 +8074,17 @@ _EOF
   diff "${outpath}.b" "${outpath}.c"
 }
 
+@test "build-with-timestamp-applies-to-oci-archive-with-base" {
+  local outpath="${TEST_SCRATCH_DIR}/timestamp-oci.tar"
+
+  run_buildah build -f <(echo 'FROM busybox') --tag=oci-archive:${outpath}.a --timestamp 0
+  sleep 1.1 # sleep at least 1 second, so that timestamps are incremented
+  run_buildah build -f <(echo 'FROM busybox') --tag=oci-archive:${outpath}.b --timestamp 0
+
+  # should be the same
+  diff "${outpath}.a" "${outpath}.b"
+}
+
 @test "bud-source-date-epoch-arg" {
   _prefetch busybox
   local timestamp=60