Browse Source

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

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/4866/head
Derek Nola 3 years ago committed by GitHub
parent
commit
612a9412fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      BUILDING.md
  2. 2
      Dockerfile.dapper
  3. 5
      Makefile

2
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`.

2
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

5
Makefile

@ -22,11 +22,6 @@ release:
.PHONY: $(TARGETS)
.PHONY: generate
generate: build/data
./scripts/download
go generate
build/data:
mkdir -p $@

Loading…
Cancel
Save