Unverified Commit 612a9412 authored by Derek Nola's avatar Derek Nola Committed by GitHub

Enable make generate to use dapper and standardize go and gzip versions (#4861)

parent 142b1d96
...@@ -10,7 +10,7 @@ This repo includes all of Kubernetes history so `--depth 1` will avoid most of t ...@@ -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. 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:. To prepare these resources for your build environment, run:.
```bash ```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`. To build the full release binary, you may now run `make`, which will create `./dist/artifacts/k3s`.
......
...@@ -42,7 +42,7 @@ ENV SELINUX $SELINUX ...@@ -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_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_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_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 DAPPER_DOCKER_SOCKET true
ENV HOME ${DAPPER_SOURCE} ENV HOME ${DAPPER_SOURCE}
ENV CROSS true ENV CROSS true
......
...@@ -22,11 +22,6 @@ release: ...@@ -22,11 +22,6 @@ release:
.PHONY: $(TARGETS) .PHONY: $(TARGETS)
.PHONY: generate
generate: build/data
./scripts/download
go generate
build/data: build/data:
mkdir -p $@ mkdir -p $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment