last try and then I'm disabling validation

replicatedhq · Aug 8, 2018 · 7f11a32 · 7f11a32
1 parent 862f2bd
commit 7f11a32
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 100 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: build-deps -dep-deps docker shell githooks dep fmt _vet vet _lint lint _test test build e2e run build_yoonit_docker_image _build citest ci-upload-coverage goreleaser integration-test build_ship_integration_test build-ui embed-ui
+.PHONY: build-deps -dep-deps docker shell githooks dep fmt _vet vet _lint lint _test test build e2e run build_yoonit_docker_image _build citest ci-upload-coverage goreleaser integration-test build_ship_integration_test build-ui embed-ui pkg/lifecycle/ui.bindatafs.go
 
 
 SHELL := /bin/bash
@@ -220,9 +220,10 @@ build_yoonit_docker_image:
 build_ship_integration_test:
 	docker build -t $(DOCKER_REPO)/ship-e2e-test:latest -f ./integration/Dockerfile .
 
-pkg/lifeycle/daemon/ui.bindatafs.go: .state/build-deps $(UI)
+pkg/lifeycle/daemon/ui.bindatafs.go: .state/build-deps 
 	cd web; go-bindata-assetfs -pkg daemon \
 	  -o ../pkg/lifecycle/daemon/ui.bindatafs.go \
+	  -nometadata \
 	  dist/...
 
 embed-ui: pkg/lifeycle/daemon/ui.bindatafs.go fmt

diff --git a/pkg/lifecycle/daemon/ui.bindatafs.go b/pkg/lifecycle/daemon/ui.bindatafs.go
diff --git a/web/Makefile b/web/Makefile
@@ -22,6 +22,7 @@ serve_ship:
 	`yarn bin`/webpack-dev-server --config webpack.config.js --progress -w --debug --env shipDev --mode development
 
 .state/build_ship: .state/package $(SRC)
+	rm -rf dist
 	`yarn bin`/webpack --config webpack.config.js --env ship --mode production
 	@mkdir -p .state
 	@touch .state/build_ship