Merge pull request #17 from crazy-max/vendor-targets

Vendor targets

Author: crazy-max

.github/workflows/validate.yml

@@ -21,6 +21,7 @@ jobs:
       matrix:
         target:
           - lint
+          - validate-vendor
     steps:
       -
         name: Checkout

Makefile

@@ -0,0 +1,37 @@
+ifneq (, $(BUILDX_BIN))
+	export BUILDX_CMD = $(BUILDX_BIN)
+else ifneq (, $(shell docker buildx version))
+	export BUILDX_CMD = docker buildx
+else ifneq (, $(shell which buildx))
+	export BUILDX_CMD = $(which buildx)
+else
+	$(error "Buildx is required: https://github.com/docker/buildx#installing")
+endif
+
+CHANNEL ?= mainline
+
+image:
+	CHANNEL=$(CHANNEL) $(BUILDX_CMD) bake
+
+vendor:
+	$(eval $@_TMP_OUT := $(shell mktemp -d -t dockerfile-output.XXXXXXXXXX))
+	$(BUILDX_CMD) bake --set "*.output=$($@_TMP_OUT)" vendor
+	rm -rf ./vendor
+	cp -R "$($@_TMP_OUT)"/out/* .
+	rm -rf $($@_TMP_OUT)/*
+
+mod-outdated:
+	$(BUILDX_CMD) bake mod-outdated
+
+validate: lint test validate-vendor
+
+lint:
+	$(BUILDX_CMD) bake lint
+
+test:
+	./hack/test integration
+
+validate-vendor:
+	$(BUILDX_CMD) bake validate-vendor
+
+.PHONY: image vendor mod-outdated validate lint test validate-vendor

README.md

@@ -61,18 +61,26 @@ change in between releases on labs channel, the old versions are guaranteed to b
 
 ## Build
 
+`docker/dockerfile` is developed using Docker.
+
 ```shell
-# build image and output to docker with dockerfile:local tag (default)
-docker buildx bake
+# build mainline channel image (output to docker)
+make image
+
+# build mainline channel image (output to docker)
+CHANNEL=labs make image
+
+# vendor
+make vendor
 
-# build multi-platform image
-docker buildx bake image-cross
+# validate
+make validate
 
-# build labs channel
-CHANNEL=labs docker buildx bake
+# check dependencies updates
+make mod-outdated
 
-# build and push to username/dockerfile:test
-docker buildx bake image --push --set *.tags=username/dockerfile:test
+# build and push multi-platform mainline channel image to username/dockerfile:test
+docker buildx bake image-cross --push --set *.tags=username/dockerfile:test
 ```
 
 ## Examples

docker-bake.hcl

@@ -44,6 +44,25 @@ target "image-cross" {
   ]
 }
 
+target "vendor" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
+  target = "update"
+  output = ["."]
+}
+
+target "mod-outdated" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
+  target = "outdated"
+  args = {
+    // used to invalidate cache for outdated run stage
+    // can be dropped when https://github.com/moby/buildkit/issues/1213 fixed
+    _RANDOM = uuidv4()
+  }
+  output = ["type=cacheonly"]
+}
+
 group "validate" {
   targets = ["lint"]
 }
@@ -53,3 +72,10 @@ target "lint" {
   dockerfile = "./hack/dockerfiles/lint.Dockerfile"
   output = ["type=cacheonly"]
 }
+
+target "validate-vendor" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
+  target = "validate"
+  output = ["type=cacheonly"]
+}

go.mod

@@ -6,14 +6,12 @@ require (
 	github.com/containerd/containerd v1.6.0-beta.3
 	github.com/containerd/continuity v0.2.1
 	github.com/docker/distribution v2.7.1+incompatible
-	github.com/docker/docker v20.10.7+incompatible // master (v21.xx-dev)
+	github.com/docker/docker v20.10.12+incompatible // master
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.4.0
 	github.com/google/go-cmp v0.5.6
-	github.com/moby/buildkit v0.9.1-0.20220107201744-ffe2301031c8
-	github.com/moby/sys/mount v0.3.0 // indirect
+	github.com/moby/buildkit v0.9.3
 	github.com/moby/sys/signal v0.6.0
-	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
@@ -41,11 +39,14 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/moby/locker v1.0.1 // indirect
+	github.com/moby/sys/mount v0.3.0 // indirect
 	github.com/moby/sys/mountinfo v0.5.0 // indirect
+	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/runc v1.0.2 // indirect
@@ -74,6 +75,7 @@ require (
 
 replace (
 	github.com/docker/docker => github.com/docker/docker v20.10.3-0.20211208011758-87521affb077+incompatible
+	github.com/moby/buildkit => github.com/moby/buildkit v0.9.1-0.20220107201744-ffe2301031c8
 	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace => github.com/tonistiigi/opentelemetry-go-contrib/instrumentation/net/http/httptrace/otelhttptrace v0.0.0-20211026174723-2f82a1e0c997
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => github.com/tonistiigi/opentelemetry-go-contrib/instrumentation/net/http/otelhttp v0.0.0-20211026174723-2f82a1e0c997
 )