Backport k3s-io#4861

Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola · Jan 20, 2022 · 4e829c8 · 4e829c8
1 parent a60e1b1
commit 4e829c8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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 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
@@ -22,11 +22,6 @@ release:
 
 .PHONY: $(TARGETS)
 
-.PHONY: generate
-generate: build/data 
-	./scripts/download
-	go generate
-
 build/data:
 	mkdir -p $@