hack: bake definition with vendor targets

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

Makefile

@@ -1,46 +1,62 @@
 prefix=/usr/local
 bindir=$(prefix)/bin
 
-binaries: FORCE
+export BUILDX_CMD ?= docker buildx
+
+.PHONY: binaries
+binaries:
 	hack/binaries
 
-images: FORCE
+.PHONY: images
+images:
 # moby/buildkit:local and moby/buildkit:local-rootless are created on Docker
 	hack/images local moby/buildkit
 	TARGET=rootless hack/images local moby/buildkit
 
-install: FORCE
+.PHONY: install
+install:
 	mkdir -p $(DESTDIR)$(bindir)
 	install bin/* $(DESTDIR)$(bindir)
 
-clean: FORCE
+.PHONY: clean
+clean:
 	rm -rf ./bin
 
+.PHONY: test
 test:
 	./hack/test integration gateway dockerfile
 
+.PHONY: lint
 lint:
 	./hack/lint
 
+.PHONY: validate-vendor
 validate-vendor:
-	./hack/validate-vendor
+	$(BUILDX_CMD) bake validate-vendor
 
+.PHONY: validate-shfmt
 validate-shfmt:
 	./hack/validate-shfmt
 
+.PHONY: shfmt
 shfmt:
 	./hack/shfmt
 
+.PHONY: validate-generated-files
 validate-generated-files:
 	./hack/validate-generated-files
 
+.PHONY: validate-all
 validate-all: test lint validate-vendor validate-generated-files
 
+.PHONY: vendor
 vendor:
-	./hack/update-vendor
+	$(eval $@_TMP_OUT := $(shell mktemp -d -t buildkit-output.XXXXXXXXXX))
+	$(BUILDX_CMD) bake --set "*.output=type=local,dest=$($@_TMP_OUT)" vendor
+	rm -rf ./vendor
+	cp -R "$($@_TMP_OUT)"/out/* .
+	rm -rf "$($@_TMP_OUT)"/
 
+.PHONY: generated-files
 generated-files:
 	./hack/update-generated-files
-
-.PHONY: vendor generated-files test binaries images install clean lint validate-all validate-vendor validate-generated-files
-FORCE:

docker-bake.hcl

@@ -0,0 +1,28 @@
+variable "GO_VERSION" {
+  default = null
+}
+
+target "_common" {
+  args = {
+    GO_VERSION = GO_VERSION
+    BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1
+  }
+}
+
+group "validate" {
+  targets = ["validate-vendor"]
+}
+
+target "validate-vendor" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
+  target = "validate"
+  output = ["type=cacheonly"]
+}
+
+target "vendor" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
+  target = "update"
+  output = ["."]
+}

hack/dockerfiles/vendor.Dockerfile

@@ -2,20 +2,36 @@
 
 ARG GO_VERSION=1.20
 
-FROM golang:${GO_VERSION}-alpine AS vendored
-RUN  apk add --no-cache git
+FROM golang:${GO_VERSION}-alpine AS base
+RUN apk add --no-cache git rsync
 WORKDIR /src
-RUN --mount=target=/src,rw \
-  --mount=target=/go/pkg/mod,type=cache \
-  go mod tidy && go mod vendor && \
-  mkdir /out && cp -r go.mod go.sum vendor /out
+
+FROM base AS vendored
+RUN --mount=target=/context \
+    --mount=target=.,type=tmpfs  \
+    --mount=target=/go/pkg/mod,type=cache <<EOT
+  set -e
+  rsync -a /context/. .
+  go mod tidy
+  go mod vendor
+  mkdir /out
+  cp -r go.mod go.sum vendor /out
+EOT
 
 FROM scratch AS update
 COPY --from=vendored /out /out
 
 FROM vendored AS validate
-RUN --mount=target=.,rw \
-  git add -A && \
-  rm -rf vendor && \
-  cp -rf /out/* . && \
-  ./hack/validate-vendor check
+RUN --mount=target=/context \
+    --mount=target=.,type=tmpfs <<EOT
+  set -e
+  rsync -a /context/. .
+  git add -A
+  rm -rf vendor
+  cp -rf /out/* .
+  if [ -n "$(git status --porcelain -- go.mod go.sum vendor)" ]; then
+    echo >&2 'ERROR: Vendor result differs. Please vendor your package with "make vendor"'
+    git status --porcelain -- go.mod go.sum vendor
+    exit 1
+  fi
+EOT