From 612a9412fd2b8a95be39b28d11e9eb115e5b2460 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Tue, 4 Jan 2022 11:12:25 -0800 Subject: [PATCH] Enable make generate to use dapper and standardize go and gzip versions (#4861) Signed-off-by: Derek Nola --- BUILDING.md | 2 +- Dockerfile.dapper | 2 +- Makefile | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 2281810650..5cfb7cb0c8 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -10,7 +10,7 @@ This repo includes all of Kubernetes history so `--depth 1` will avoid most of t The k3s build process requires some autogenerated code and remote artifacts that are not checked in to version control. To prepare these resources for your build environment, run:. ```bash -mkdir -p build/data && ./scripts/download && go generate +mkdir -p build/data && make download && make generate ``` To build the full release binary, you may now run `make`, which will create `./dist/artifacts/k3s`. diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 529dd93fcb..4b6503813e 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -42,7 +42,7 @@ ENV SELINUX $SELINUX ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache -v trivy-cache:/root/.cache/trivy ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP GCLOUD_AUTH GITHUB_TOKEN GOLANG ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/ -ENV DAPPER_OUTPUT ./bin ./dist ./build/out +ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy ENV DAPPER_DOCKER_SOCKET true ENV HOME ${DAPPER_SOURCE} ENV CROSS true diff --git a/Makefile b/Makefile index a1dc61fc5e..d18f7c1884 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,6 @@ release: .PHONY: $(TARGETS) -.PHONY: generate -generate: build/data - ./scripts/download - go generate - build/data: mkdir -p $@