Move docker build to `make build-docker`

pull/36/head
Matt Baer 6 years ago
parent 695bc79696
commit 402f66770e
  1. 7
      Makefile

@ -24,6 +24,9 @@ build-windows: deps
build-darwin: deps build-darwin: deps
cd cmd/writefreely; GOOS=darwin GOARCH=amd64 $(GOBUILD) -v cd cmd/writefreely; GOOS=darwin GOARCH=amd64 $(GOBUILD) -v
build-docker :
$(DOCKERCMD) build -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(GITREV) .
test: test:
$(GOTEST) -v ./... $(GOTEST) -v ./...
@ -55,8 +58,8 @@ release : clean ui
rm build/$(BINARY_NAME) rm build/$(BINARY_NAME)
$(MAKE) build-windows $(MAKE) build-windows
cp cmd/writefreely/$(BINARY_NAME).exe build cp cmd/writefreely/$(BINARY_NAME).exe build
cd build; zip -r ../$(BINARY_NAME)_$(GITREV)_windows_amd64.zip ./*; cd .. cd build; zip -r ../$(BINARY_NAME)_$(GITREV)_windows_amd64.zip ./*
$(DOCKERCMD) build -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(GITREV) . $(MAKE) build-docker
ui : force_look ui : force_look
cd less/; $(MAKE) $(MFLAGS) cd less/; $(MAKE) $(MFLAGS)

Loading…
Cancel
Save