Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,9 @@ RUN --mount=type=bind,target=.,rw \
make bin/protoc-gen-gogoswarm && mv bin/protoc-gen-gogoswarm /usr/local/bin/

FROM gobase AS protobuild
RUN --mount=type=bind,source=tools,target=. \
--mount=target=/go/pkg/mod,type=cache \
RUN --mount=type=bind,target=. \
--mount=type=cache,target=/root/.cache \
go install -mod=mod github.com/containerd/protobuild
go install tool github.com/containerd/protobuild

FROM gobase AS generate-base
ARG DEBIAN_FRONTEND
Expand Down Expand Up @@ -126,7 +125,7 @@ ENV GO111MODULE=on
# install the dependencies from `make setup`
# we only copy `direct.mk` to avoid busting the cache too easily
COPY direct.mk .
COPY tools ./tools
COPY go.* .
RUN make --file=direct.mk setup
# now we can copy the rest
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion direct.mk
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ setup: ## install dependencies
@echo "🐳 $@"
# install golangci-lint to ./bin/golangci-lint
@curl -fsSL https://raw.githubusercontent.com/golangci/golangci-lint/v2.1.5/install.sh | sh -s v2.1.5
@(cd ./tools ; GO111MODULE=on go install github.com/containerd/protobuild)
@go install tool github.com/containerd/protobuild

.PHONY: generate
generate: protos
Expand Down
4 changes: 4 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/protobuild v0.3.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand All @@ -68,6 +69,7 @@ require (
github.com/klauspost/compress v1.17.9 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pelletier/go-toml v1.8.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
Expand All @@ -91,3 +93,5 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
)

tool github.com/containerd/protobuild
56 changes: 56 additions & 0 deletions go.sum

Large diffs are not rendered by default.

14 changes: 0 additions & 14 deletions tools/go.mod

This file was deleted.

65 changes: 0 additions & 65 deletions tools/go.sum

This file was deleted.

7 changes: 0 additions & 7 deletions tools/tools.go

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading