Merge pull request #61 from jedevc/add-vendor-directory

.github/workflows/validate.yml

@@ -19,6 +19,7 @@ jobs:
       matrix:
         target:
           - validate-license
+          - validate-vendor
     steps:
       -
         name: Checkout

Dockerfile

@@ -22,6 +22,7 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
 COPY --from=xx / /
+ENV GOFLAGS=-mod=vendor
 ENV CGO_ENABLED=0
 RUN apk add --no-cache file git
 WORKDIR /src
@@ -40,14 +41,9 @@ RUN --mount=target=. <<EOT
 EOT
 
 FROM base as build
-RUN --mount=type=bind,source=go.mod,target=go.mod \
-    --mount=type=bind,source=go.sum,target=go.sum \
-    --mount=type=cache,target=/go/pkg/mod \
-    go mod download -x
 ARG TARGETPLATFORM
 RUN --mount=type=bind,target=. \
     --mount=type=bind,from=version,source=/tmp/.ldflags,target=/tmp/.ldflags \
-    --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache <<EOT
   set -e
   xx-go build -trimpath -ldflags "$(cat /tmp/.ldflags)" -o /usr/local/bin/syft-scanner ./cmd/syft-scanner

Makefile

@@ -1,9 +1,18 @@
-.PHONY: all dev examples
-
+.PHONY: all
 all:
 
+.PHONY: dev
 dev:
 	IMAGE_LOCAL=$(IMAGE) docker buildx bake --push
 
+.PHONY: examples
 examples:
 	./hack/check-example.sh $(IMAGE) ./examples/*
+
+.PHONY: vendor
+vendor:
+	$(eval $@_TMP_OUT := $(shell mktemp -d -t buildkit-output.XXXXXXXXXX))
+	docker buildx bake --set "*.output=type=local,dest=$($@_TMP_OUT)" update-vendor
+	rm -rf ./vendor
+	cp -R "$($@_TMP_OUT)"/out/* .
+	rm -rf "$($@_TMP_OUT)"/

docker-bake.hcl

@@ -73,3 +73,17 @@ target "update-license" {
   target = "update"
   output = ["."]
 }
+
+target "validate-vendor" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
+  target = "validate"
+  output = ["type=cacheonly"]
+}
+
+target "update-vendor" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
+  target = "update"
+  output = ["."]
+}

hack/dockerfiles/vendor.Dockerfile

@@ -0,0 +1,53 @@
+# syntax=docker/dockerfile:1
+
+# Copyright 2022 buildkit authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# upstream at https://github.com/moby/buildkit/blob/master/hack/dockerfiles/vendor.Dockerfile
+
+ARG GO_VERSION=1.20
+
+FROM golang:${GO_VERSION}-alpine AS base
+RUN apk add --no-cache git rsync
+WORKDIR /src
+
+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=/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