ci: opt-in buildinfo attrs with output opt

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
master
CrazyMax 2022-03-01 14:23:48 +01:00
parent 578f045d5c
commit 46422e3aba
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
9 changed files with 12 additions and 12 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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=""

View File

@ -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