hack: doctoc bake target

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

Author: crazy-max

Makefile

@@ -50,8 +50,12 @@ validate-authors:
 validate-generated-files:
 	./hack/validate-generated-files
 
+.PHONY: validate-doctoc
+validate-doctoc:
+	$(BUILDX_CMD) bake validate-doctoc
+
 .PHONY: validate-all
-validate-all: test lint validate-vendor validate-generated-files
+validate-all: test lint validate-vendor validate-generated-files validate-doctoc
 
 .PHONY: vendor
 vendor:
@@ -68,3 +72,7 @@ generated-files:
 .PHONY: authors
 authors:
 	$(BUILDX_CMD) bake authors
+
+.PHONY: doctoc
+doctoc:
+	$(BUILDX_CMD) bake doctoc

docker-bake.hcl

@@ -6,16 +6,21 @@ variable "GO_VERSION" {
   default = null
 }
 
+variable "NODE_VERSION" {
+  default = null
+}
+
 target "_common" {
   args = {
     ALPINE_VERSION = ALPINE_VERSION
     GO_VERSION = GO_VERSION
+    NODE_VERSION = NODE_VERSION
     BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1
   }
 }
 
 group "validate" {
-  targets = ["lint", "validate-vendor"]
+  targets = ["lint", "validate-vendor", "validate-doctoc"]
 }
 
 target "lint" {
@@ -31,6 +36,13 @@ target "validate-vendor" {
   output = ["type=cacheonly"]
 }
 
+target "validate-doctoc" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/doctoc.Dockerfile"
+  target = "validate-toc"
+  output = ["type=cacheonly"]
+}
+
 target "validate-authors" {
   inherits = ["_common"]
   dockerfile = "./hack/dockerfiles/authors.Dockerfile"
@@ -45,6 +57,13 @@ target "vendor" {
   output = ["."]
 }
 
+target "doctoc" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/doctoc.Dockerfile"
+  target = "update"
+  output = ["."]
+}
+
 target "authors" {
   inherits = ["_common"]
   dockerfile = "./hack/dockerfiles/authors.Dockerfile"

hack/dockerfiles/doctoc.Dockerfile

@@ -0,0 +1,31 @@
+# syntax=docker/dockerfile-upstream:master
+
+ARG NODE_VERSION=19
+
+FROM node:${NODE_VERSION}-alpine AS base
+RUN apk add --no-cache git
+WORKDIR /src
+
+FROM base AS doctoc
+RUN npm install -g doctoc
+RUN --mount=type=bind,source=README.md,target=README.md,rw <<EOT
+  set -e
+  doctoc README.md
+  mkdir /out
+  cp README.md /out/
+EOT
+
+FROM scratch AS update
+COPY --from=doctoc /out /
+
+FROM base AS validate-toc
+RUN --mount=type=bind,target=.,rw \
+    --mount=type=bind,from=doctoc,source=/out/README.md,target=./README.md <<EOT
+  set -e
+  diff=$(git status --porcelain -- 'README.md')
+  if [ -n "$diff" ]; then
+    echo >&2 'ERROR: The result of "doctoc" differs. Please update with "make doctoc"'
+    echo "$diff"
+    exit 1
+  fi
+EOT

hack/dockerfiles/generated-files.Dockerfile

@@ -1,7 +1,6 @@
 # syntax=docker/dockerfile-upstream:master
 
 ARG GO_VERSION="1.20"
-ARG NODE_VERSION="19"
 ARG PROTOC_VERSION="3.11.4"
 
 # protoc is dynamically linked to glibc so can't use alpine base
@@ -54,24 +53,3 @@ RUN --mount=type=bind,target=.,rw \
     exit 1
   fi
 EOT
-
-FROM node:${NODE_VERSION}-alpine AS doctoc
-RUN npm install -g doctoc
-WORKDIR /buildkit
-RUN --mount=type=bind,target=.,rw <<EOT
-  doctoc README.md
-  mkdir /out
-  cp README.md /out/
-EOT
-
-FROM base AS validate-toc
-RUN --mount=type=bind,target=.,rw \
-    --mount=type=bind,from=doctoc,source=/out/README.md,target=./README.md <<EOT
-  set -e
-  diff=$(git status --porcelain -- 'README.md')
-  if [ -n "$diff" ]; then
-    echo >&2 'ERROR: The result of "doctoc" differs. Please update with "doctoc README.md"'
-    echo "$diff"
-    exit 1
-  fi
-EOT

hack/validate-generated-files

@@ -8,9 +8,3 @@ buildxCmd build \
   --output "type=cacheonly" \
   --file "./hack/dockerfiles/generated-files.Dockerfile" \
   .
-
-buildxCmd build \
-  --target "validate-toc" \
-  --output "type=cacheonly" \
-  --file "./hack/dockerfiles/generated-files.Dockerfile" \
-  .