From 46422e3aba72026d0e874b7e0ff5f8fd385a1d6b Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Tue, 1 Mar 2022 14:23:48 +0100
Subject: [PATCH] ci: opt-in buildinfo attrs with output opt

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 Dockerfile                                               | 2 +-
 frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile   | 2 +-
 frontend/dockerfile/cmd/dockerfile-frontend/hack/release | 6 +++---
 hack/dockerfiles/generated-files.Dockerfile              | 2 +-
 hack/dockerfiles/lint.Dockerfile                         | 2 +-
 hack/dockerfiles/shfmt.Dockerfile                        | 2 +-
 hack/dockerfiles/vendor.Dockerfile                       | 2 +-
 hack/images                                              | 4 ++--
 hack/util                                                | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3d57067d..f233b554 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile-upstream:master
+# syntax=docker/dockerfile-upstream:master
 
 ARG RUNC_VERSION=v1.0.2
 ARG CONTAINERD_VERSION=v1.6.0
diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile
index f97d4431..7f181948 100644
--- a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile
+++ b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile:1.3
+# syntax=docker/dockerfile-upstream:master
 
 # xx is a helper for cross-compilation
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:golang@sha256:810dc54d5144f133a218e88e319184bf8b9ce01d37d46ddb37573e90decd9eef AS xx
diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/hack/release b/frontend/dockerfile/cmd/dockerfile-frontend/hack/release
index 187835d2..b572bda1 100755
--- a/frontend/dockerfile/cmd/dockerfile-frontend/hack/release
+++ b/frontend/dockerfile/cmd/dockerfile-frontend/hack/release
@@ -87,7 +87,7 @@ case $TYP in
   buildxCmd build $platformFlag $cacheFromFlags $cacheToFlags \
     --build-arg "CHANNEL=$TAG" \
     --build-arg "BUILDTAGS=$buildTags" \
-    --output "type=image,name=$REPO:$pushTag,$pushFlag" \
+    --output "type=image,name=$REPO:$pushTag,buildinfo-attrs=true,$pushFlag" \
     --file "./frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile" \
     $currentcontext
   ;;
@@ -104,7 +104,7 @@ case $TYP in
   buildxCmd build $platformFlag $cacheFromFlags $cacheToFlags \
     --build-arg "CHANNEL=$TAG" \
     --build-arg "BUILDTAGS=$buildTags" \
-    --output "type=image,\"name=$publishedNames\",$pushFlag" \
+    --output "type=image,\"name=$publishedNames\",buildinfo-attrs=true,$pushFlag" \
     --file "./frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile" \
     $currentcontext
   ;;
@@ -144,7 +144,7 @@ case $TYP in
       buildxCmd build $platformFlag $cacheFromFlags $cacheToFlags \
         --build-arg "CHANNEL=$TAG" \
         --build-arg "BUILDTAGS=$buildTags" \
-        --output "type=image,name=$REPO:$dt-$TAG,$pushFlag" \
+        --output "type=image,name=$REPO:$dt-$TAG,buildinfo-attrs=true,$pushFlag" \
         --file "./frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile" \
         $currentcontext
       rm $tmp/buildid
diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile
index 1f7e2443..a9f6f0bb 100644
--- a/hack/dockerfiles/generated-files.Dockerfile
+++ b/hack/dockerfiles/generated-files.Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.3
+# syntax=docker/dockerfile-upstream:master
 
 # protoc is dynamically linked to glibc to can't use golang:1.10-alpine
 FROM golang:1.17-buster AS gobuild-base
diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile
index aab9deaf..62c3c290 100644
--- a/hack/dockerfiles/lint.Dockerfile
+++ b/hack/dockerfiles/lint.Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.3
+# syntax=docker/dockerfile-upstream:master
 
 FROM golang:1.17-alpine
 RUN apk add --no-cache gcc musl-dev yamllint
diff --git a/hack/dockerfiles/shfmt.Dockerfile b/hack/dockerfiles/shfmt.Dockerfile
index f7f0a271..fb5db637 100644
--- a/hack/dockerfiles/shfmt.Dockerfile
+++ b/hack/dockerfiles/shfmt.Dockerfile
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile:1.3
+# syntax=docker/dockerfile-upstream:master
 FROM mvdan/shfmt:v3.1.2-alpine AS shfmt
 WORKDIR /src
 ARG SHFMT_FLAGS="-i 2 -ci"
diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile
index 48878e1d..a0d0607e 100644
--- a/hack/dockerfiles/vendor.Dockerfile
+++ b/hack/dockerfiles/vendor.Dockerfile
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile:1.3
+# syntax=docker/dockerfile-upstream:master
 
 FROM golang:1.17-alpine AS vendored
 RUN  apk add --no-cache git
diff --git a/hack/images b/hack/images
index 004265fd..1b172059 100755
--- a/hack/images
+++ b/hack/images
@@ -41,10 +41,10 @@ fi
 
 outputFlag="--output=type=image,push=false"
 if [ "$PUSH" = "push" ]; then
-  outputFlag="--output=type=image,push=true"
+  outputFlag="--output=type=image,buildinfo-attrs=true,push=true"
 fi
 if [ -n "$localmode" ]; then
-  outputFlag="--output=type=docker"
+  outputFlag="--output=type=docker,buildinfo-attrs=true"
 fi
 
 targetFlag=""
diff --git a/hack/util b/hack/util
index 47956fb1..44fb5c9f 100755
--- a/hack/util
+++ b/hack/util
@@ -59,5 +59,5 @@ if [ "$GITHUB_ACTIONS" = "true" ]; then
   fi
 fi
 if [ -n "$currentref" ]; then
-  currentcontext="--build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=1 --build-arg BUILDKIT_INLINE_BUILDINFO_ATTRS=1 $currentref"
+  currentcontext="--build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=1 $currentref"
 fi