Build container has no yarn

This commit is contained in:
Benedikt Kulmann
2020-07-01 11:44:21 +02:00
parent fb3b6dcd5f
commit 2e102066db
2 changed files with 2 additions and 7 deletions
+1 -6
View File
@@ -79,7 +79,7 @@ lint:
for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;
.PHONY: generate
generate: protobuf webapp
generate: protobuf
go generate $(GENERATE)
.PHONY: changelog
@@ -197,8 +197,3 @@ $(PROTO_SRC)/accounts.swagger.json: $(PROTO_SRC)/accounts.proto
.PHONY: protobuf
protobuf: $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger \
$(PROTO_SRC)/accounts.pb.go $(PROTO_SRC)/accounts.pb.micro.go $(PROTO_SRC)/accounts.pb.web.go $(PROTO_SRC)/accounts.swagger.json
.PHONY: webapp
webapp:
yarn generate-api
yarn build
+1 -1
View File
@@ -2,4 +2,4 @@
-r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/ocis-accounts && bin/ocis-accounts server --asset-path assets/'
# frontend
-r '^ui/.*\.(vue|js)$' -R '^node_modules/' -- sh -c 'make generate'
-r '^ui/.*\.(vue|js)$' -R '^node_modules/' -- sh -c 'yarn build && make generate'