Add explicit variants to buildkit (rc, dev, 0.13, for now)

tianon · Jun 25, 2024 · 2b78191 · 2b78191
1 parent 793057d
commit 2b78191
Show file tree

Hide file tree

Showing 7 changed files with 443 additions and 14 deletions.
diff --git a/buildkit/Dockerfile.0.13 b/buildkit/Dockerfile.0.13
@@ -0,0 +1,83 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM --platform=$BUILDPLATFORM golang:1.21 AS build
+
+# https://github.com/moby/buildkit/releases
+ENV BUILDKIT_VERSION 0.13.2
+
+COPY \
+ backport-5072-fetch-tags.patch \
+ containerd-arm64-v8.patch \
+ git-no-submodules.patch \
+ mips64le.patch \
+ noclip.patch \
+ /tmp/buildkit-patches/
+
+WORKDIR /app
+
+RUN set -eux; \
+ git clone --branch "v$BUILDKIT_VERSION" --depth 1 --config advice.detachedHead=false 'https://github.com/moby/buildkit.git' .; \
+ git apply /tmp/buildkit-patches/*.patch; \
+ git diff --color
+
+ENV CGO_ENABLED 0
+
+ARG TARGETOS TARGETARCH TARGETVARIANT
+ENV GOOS=$TARGETOS GOARCH=$TARGETARCH VARIANT=$TARGETVARIANT
+
+RUN set -eux; \
+ case "$GOARCH" in \
+ arm) export GOARM="${VARIANT#v}" ;; \
+ amd64) export GOAMD64="$VARIANT" ;; \
+ *) [ -z "$VARIANT" ] ;; \
+ esac; \
+ go env | grep -E 'OS=|ARCH=|ARM=|AMD64='; \
+ \
+# https://github.com/moby/buildkit/blob/v0.13.2/Dockerfile#L93
+ pkg='github.com/moby/buildkit'; \
+ ldflags=" \
+ -d -w \
+ -X '$pkg/version.Version=$BUILDKIT_VERSION-tianon' \
+ -X '$pkg/version.Revision=v$BUILDKIT_VERSION+tianon-patches' \
+ -X '$pkg/version.Package=$pkg' \
+ "; \
+ go build -o /buildkitd -trimpath -ldflags "$ldflags" ./cmd/buildkitd; \
+ go build -o /buildctl -trimpath -ldflags "$ldflags" ./cmd/buildctl; \
+ \
+# https://github.com/moby/buildkit/blob/v0.14.0/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile#L21
+ pkg='github.com/moby/buildkit/frontend/dockerfile/cmd/dockerfile-frontend'; \
+ ldflags=" \
+ -d -w \
+ -X '$pkg/version.Version=buildkit-$BUILDKIT_VERSION-tianon' \
+ -X '$pkg/version.Revision=v$BUILDKIT_VERSION+tianon-patches' \
+ -X '$pkg/version.Package=$pkg' \
+ "; \
+ go build -o /dockerfile-frontend -trimpath -ldflags "$ldflags" ./frontend/dockerfile/cmd/dockerfile-frontend
+
+FROM --platform=$TARGETPLATFORM infosiftr/moby
+
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends git; \
+ rm -rf /var/lib/apt/lists/*
+
+COPY --from=build --link /buildkitd /buildctl /dockerfile-frontend /usr/local/bin/
+COPY buildkitd-entrypoint.sh /usr/local/bin/
+
+VOLUME /var/lib/buildkit
+
+# https://github.com/docker/buildx/issues/484#issuecomment-749352728
+ENV BUILDKIT_STEP_LOG_MAX_SIZE -1
+ENV BUILDKIT_STEP_LOG_MAX_SPEED -1
+
+# https://github.com/moby/buildkit/blob/v0.14.0/frontend/gateway/gateway.go#L309
+# https://github.com/moby/buildkit/blob/v0.14.0/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile#L35-L36
+LABEL moby.buildkit.frontend.network.none="true"
+LABEL moby.buildkit.frontend.caps="moby.buildkit.frontend.inputs,moby.buildkit.frontend.subrequests,moby.buildkit.frontend.contexts"
+
+ENTRYPOINT ["buildkitd-entrypoint.sh"]
+CMD []
diff --git a/buildkit/Dockerfile.dev b/buildkit/Dockerfile.dev
@@ -0,0 +1,87 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM --platform=$BUILDPLATFORM golang:1.21 AS build
+
+# https://github.com/moby/buildkit/commits/HEAD
+# https://github.com/moby/buildkit/tree/aaaf86e5470bffbb395f5c15ad4a1c152642ea30
+ARG BUILDKIT_COMMIT=aaaf86e5470bffbb395f5c15ad4a1c152642ea30
+ENV BUILDKIT_COMMIT $BUILDKIT_COMMIT
+
+COPY \
+ containerd-arm64-v8.patch \
+ git-no-submodules.patch \
+ mips64le.patch \
+ noclip.patch \
+ /tmp/buildkit-patches/
+
+WORKDIR /app
+
+RUN set -eux; \
+ git init --quiet; \
+ git config advice.detachedHead false; \
+ git fetch --depth 1 'https://github.com/moby/buildkit.git' "$BUILDKIT_COMMIT:"; \
+ git checkout FETCH_HEAD; \
+ git apply /tmp/buildkit-patches/*.patch; \
+ git diff --color
+
+ENV CGO_ENABLED 0
+
+ARG TARGETOS TARGETARCH TARGETVARIANT
+ENV GOOS=$TARGETOS GOARCH=$TARGETARCH VARIANT=$TARGETVARIANT
+
+RUN set -eux; \
+ case "$GOARCH" in \
+ arm) export GOARM="${VARIANT#v}" ;; \
+ amd64) export GOAMD64="$VARIANT" ;; \
+ *) [ -z "$VARIANT" ] ;; \
+ esac; \
+ go env | grep -E 'OS=|ARCH=|ARM=|AMD64='; \
+ \
+# https://github.com/moby/buildkit/blob/v0.13.2/Dockerfile#L93
+ pkg='github.com/moby/buildkit'; \
+ ldflags=" \
+ -d -w \
+ -X '$pkg/version.Version=dev-tianon' \
+ -X '$pkg/version.Revision=$BUILDKIT_COMMIT+tianon-patches' \
+ -X '$pkg/version.Package=$pkg' \
+ "; \
+ go build -o /buildkitd -trimpath -ldflags "$ldflags" ./cmd/buildkitd; \
+ go build -o /buildctl -trimpath -ldflags "$ldflags" ./cmd/buildctl; \
+ \
+# https://github.com/moby/buildkit/blob/v0.14.0/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile#L21
+ pkg='github.com/moby/buildkit/frontend/dockerfile/cmd/dockerfile-frontend'; \
+ ldflags=" \
+ -d -w \
+ -X '$pkg/version.Version=dev-tianon' \
+ -X '$pkg/version.Revision=$BUILDKIT_COMMIT+tianon-patches' \
+ -X '$pkg/version.Package=$pkg' \
+ "; \
+ go build -o /dockerfile-frontend -trimpath -ldflags "$ldflags" ./frontend/dockerfile/cmd/dockerfile-frontend
+
+FROM --platform=$TARGETPLATFORM infosiftr/moby
+
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends git; \
+ rm -rf /var/lib/apt/lists/*
+
+COPY --from=build --link /buildkitd /buildctl /dockerfile-frontend /usr/local/bin/
+COPY buildkitd-entrypoint.sh /usr/local/bin/
+
+VOLUME /var/lib/buildkit
+
+# https://github.com/docker/buildx/issues/484#issuecomment-749352728
+ENV BUILDKIT_STEP_LOG_MAX_SIZE -1
+ENV BUILDKIT_STEP_LOG_MAX_SPEED -1
+
+# https://github.com/moby/buildkit/blob/v0.14.0/frontend/gateway/gateway.go#L309
+# https://github.com/moby/buildkit/blob/v0.14.0/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile#L35-L36
+LABEL moby.buildkit.frontend.network.none="true"
+LABEL moby.buildkit.frontend.caps="moby.buildkit.frontend.inputs,moby.buildkit.frontend.subrequests,moby.buildkit.frontend.contexts"
+
+ENTRYPOINT ["buildkitd-entrypoint.sh"]
+CMD []
diff --git a/buildkit/Dockerfile.rc b/buildkit/Dockerfile.rc
@@ -0,0 +1,83 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM --platform=$BUILDPLATFORM golang:1.21 AS build
+
+# https://github.com/moby/buildkit/releases
+ENV BUILDKIT_VERSION 0.14.0-rc2
+
+COPY \
+ backport-5072-fetch-tags.patch \
+ containerd-arm64-v8.patch \
+ git-no-submodules.patch \
+ mips64le.patch \
+ noclip.patch \
+ /tmp/buildkit-patches/
+
+WORKDIR /app
+
+RUN set -eux; \
+ git clone --branch "v$BUILDKIT_VERSION" --depth 1 --config advice.detachedHead=false 'https://github.com/moby/buildkit.git' .; \
+ git apply /tmp/buildkit-patches/*.patch; \
+ git diff --color
+
+ENV CGO_ENABLED 0
+
+ARG TARGETOS TARGETARCH TARGETVARIANT
+ENV GOOS=$TARGETOS GOARCH=$TARGETARCH VARIANT=$TARGETVARIANT
+
+RUN set -eux; \
+ case "$GOARCH" in \
+ arm) export GOARM="${VARIANT#v}" ;; \
+ amd64) export GOAMD64="$VARIANT" ;; \
+ *) [ -z "$VARIANT" ] ;; \
+ esac; \
+ go env | grep -E 'OS=|ARCH=|ARM=|AMD64='; \
+ \
+# https://github.com/moby/buildkit/blob/v0.13.2/Dockerfile#L93
+ pkg='github.com/moby/buildkit'; \
+ ldflags=" \
+ -d -w \
+ -X '$pkg/version.Version=$BUILDKIT_VERSION-tianon' \
+ -X '$pkg/version.Revision=v$BUILDKIT_VERSION+tianon-patches' \
+ -X '$pkg/version.Package=$pkg' \
+ "; \
+ go build -o /buildkitd -trimpath -ldflags "$ldflags" ./cmd/buildkitd; \
+ go build -o /buildctl -trimpath -ldflags "$ldflags" ./cmd/buildctl; \
+ \
+# https://github.com/moby/buildkit/blob/v0.14.0/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile#L21
+ pkg='github.com/moby/buildkit/frontend/dockerfile/cmd/dockerfile-frontend'; \
+ ldflags=" \
+ -d -w \
+ -X '$pkg/version.Version=buildkit-$BUILDKIT_VERSION-tianon' \
+ -X '$pkg/version.Revision=v$BUILDKIT_VERSION+tianon-patches' \
+ -X '$pkg/version.Package=$pkg' \
+ "; \
+ go build -o /dockerfile-frontend -trimpath -ldflags "$ldflags" ./frontend/dockerfile/cmd/dockerfile-frontend
+
+FROM --platform=$TARGETPLATFORM infosiftr/moby
+
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends git; \
+ rm -rf /var/lib/apt/lists/*
+
+COPY --from=build --link /buildkitd /buildctl /dockerfile-frontend /usr/local/bin/
+COPY buildkitd-entrypoint.sh /usr/local/bin/
+
+VOLUME /var/lib/buildkit
+
+# https://github.com/docker/buildx/issues/484#issuecomment-749352728
+ENV BUILDKIT_STEP_LOG_MAX_SIZE -1
+ENV BUILDKIT_STEP_LOG_MAX_SPEED -1
+
+# https://github.com/moby/buildkit/blob/v0.14.0/frontend/gateway/gateway.go#L309
+# https://github.com/moby/buildkit/blob/v0.14.0/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile#L35-L36
+LABEL moby.buildkit.frontend.network.none="true"
+LABEL moby.buildkit.frontend.caps="moby.buildkit.frontend.inputs,moby.buildkit.frontend.subrequests,moby.buildkit.frontend.contexts"
+
+ENTRYPOINT ["buildkitd-entrypoint.sh"]
+CMD []
diff --git a/buildkit/Dockerfile.template b/buildkit/Dockerfile.template
@@ -1,11 +1,21 @@
+{{ if env.variant != "" then .[env.variant] else . end | ( -}}
 {{ # https://github.com/tianon/bashbrew/commit/823f2c4716e0c697a10a772e46a5d51c386a5dcc (bashbrew ~support for "--platform=$BUILDPLATFORM" specifically for this use case -- applied to Tianon's own local builds) -}}
 FROM --platform=$BUILDPLATFORM golang:{{ .go.version }} AS build
 
+{{ if env.variant == "dev" then ( -}}
+# https://github.com/moby/buildkit/commits/HEAD
+# https://github.com/moby/buildkit/tree/{{ .version }}
+ARG BUILDKIT_COMMIT={{ .version }}
+ENV BUILDKIT_COMMIT $BUILDKIT_COMMIT
+{{ ) else ( -}}
 # https://github.com/moby/buildkit/releases
 ENV BUILDKIT_VERSION {{ .version }}
+{{ ) end -}}
 
 COPY \
+{{ if env.variant != "dev" and (.version | startswith("0.13.") or startswith("0.14.")) then ( -}}
  backport-5072-fetch-tags.patch \
+{{ ) else "" end -}}
  containerd-arm64-v8.patch \
  git-no-submodules.patch \
  mips64le.patch \
@@ -15,7 +25,14 @@ COPY \
 WORKDIR /app
 
 RUN set -eux; \
+{{ if env.variant == "dev" then ( -}}
+ git init --quiet; \
+ git config advice.detachedHead false; \
+ git fetch --depth 1 'https://github.com/moby/buildkit.git' "$BUILDKIT_COMMIT:"; \
+ git checkout FETCH_HEAD; \
+{{ ) else ( -}}
  git clone --branch "v$BUILDKIT_VERSION" --depth 1 --config advice.detachedHead=false 'https://github.com/moby/buildkit.git' .; \
+{{ ) end -}}
  git apply /tmp/buildkit-patches/*.patch; \
  git diff --color
 
@@ -36,8 +53,13 @@ RUN set -eux; \
  pkg='github.com/moby/buildkit'; \
  ldflags=" \
  -d -w \
+{{ if env.variant == "dev" then ( -}}
+ -X '$pkg/version.Version={{ env.variant }}-tianon' \
+ -X '$pkg/version.Revision=$BUILDKIT_COMMIT+tianon-patches' \
+{{ ) else ( -}}
  -X '$pkg/version.Version=$BUILDKIT_VERSION-tianon' \
  -X '$pkg/version.Revision=v$BUILDKIT_VERSION+tianon-patches' \
+{{ ) end -}}
  -X '$pkg/version.Package=$pkg' \
  "; \
  go build -o /buildkitd -trimpath -ldflags "$ldflags" ./cmd/buildkitd; \
@@ -47,8 +69,13 @@ RUN set -eux; \
  pkg='github.com/moby/buildkit/frontend/dockerfile/cmd/dockerfile-frontend'; \
  ldflags=" \
  -d -w \
+{{ if env.variant == "dev" then ( -}}
+ -X '$pkg/version.Version={{ env.variant }}-tianon' \
+ -X '$pkg/version.Revision=$BUILDKIT_COMMIT+tianon-patches' \
+{{ ) else ( -}}
  -X '$pkg/version.Version=buildkit-$BUILDKIT_VERSION-tianon' \
  -X '$pkg/version.Revision=v$BUILDKIT_VERSION+tianon-patches' \
+{{ ) end -}}
  -X '$pkg/version.Package=$pkg' \
  "; \
  go build -o /dockerfile-frontend -trimpath -ldflags "$ldflags" ./frontend/dockerfile/cmd/dockerfile-frontend
@@ -76,3 +103,4 @@ LABEL moby.buildkit.frontend.caps="moby.buildkit.frontend.inputs,moby.buildkit.f
 
 ENTRYPOINT ["buildkitd-entrypoint.sh"]
 CMD []
+{{ ) -}}