cerc-io/laconicd-deprecated
19
0
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix make tools (indentation) and update Dockerfile to reflect fixed make target

Browse Source
This commit is contained in:
Jack Zampolin 2018-07-13 13:58:22 -07:00
parent 4304b20b3b
commit 1e61b87047
2 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -13,7 +13,7 @@ RUN apk add --update $PACKAGES
COPY . . COPY . .
# Make the binary # Make the binary
RUN make update-tools deps build RUN make tools deps build
# Final image # Final image
FROM alpine:edge FROM alpine:edge

108
Makefile
View File

@ -46,60 +46,60 @@ update-tools:
go get -u -v $(DEP) $(GOLINT) $(GOMETALINTER) $(UNCONVERT) $(INEFFASSIGN) $(MISSPELL) $(ERRCHECK) $(UNPARAM) $(GOCYCLO) go get -u -v $(DEP) $(GOLINT) $(GOMETALINTER) $(UNCONVERT) $(INEFFASSIGN) $(MISSPELL) $(ERRCHECK) $(UNPARAM) $(GOCYCLO)
tools: tools:
ifdef DEP_CHECK ifdef DEP_CHECK
@echo "Dep is already installed. Run 'make update-tools' to update." @echo "Dep is already installed. Run 'make update-tools' to update."
else else
@echo "Installing dep" @echo "Installing dep"
go get -v $(DEP) go get -v $(DEP)
endif endif
ifdef GOLINT_CHECK ifdef GOLINT_CHECK
@echo "Golint is already installed. Run 'make update-tools' to update." @echo "Golint is already installed. Run 'make update-tools' to update."
else else
@echo "Installing golint" @echo "Installing golint"
go get -v $(GOLINT) go get -v $(GOLINT)
endif endif
ifdef GOMETALINTER_CHECK ifdef GOMETALINTER_CHECK
@echo "Gometalinter.v2 is already installed. Run 'make update-tools' to update." @echo "Gometalinter.v2 is already installed. Run 'make update-tools' to update."
else else
@echo "Installing gometalinter.v2" @echo "Installing gometalinter.v2"
go get -v $(GOMETALINTER) go get -v $(GOMETALINTER)
endif endif
ifdef UNCONVERT_CHECK ifdef UNCONVERT_CHECK
@echo "Unconvert is already installed. Run 'make update-tools' to update." @echo "Unconvert is already installed. Run 'make update-tools' to update."
else else
@echo "Installing unconvert" @echo "Installing unconvert"
go get -v $(UNCONVERT) go get -v $(UNCONVERT)
endif endif
ifdef INEFFASSIGN_CHECK ifdef INEFFASSIGN_CHECK
@echo "Ineffassign is already installed. Run 'make update-tools' to update." @echo "Ineffassign is already installed. Run 'make update-tools' to update."
else else
@echo "Installing ineffassign" @echo "Installing ineffassign"
go get -v $(INEFFASSIGN) go get -v $(INEFFASSIGN)
endif endif
ifdef MISSPELL_CHECK ifdef MISSPELL_CHECK
@echo "misspell is already installed. Run 'make update-tools' to update." @echo "misspell is already installed. Run 'make update-tools' to update."
else else
@echo "Installing misspell" @echo "Installing misspell"
go get -v $(MISSPELL) go get -v $(MISSPELL)
endif endif
ifdef ERRCHECK_CHECK ifdef ERRCHECK_CHECK
@echo "errcheck is already installed. Run 'make update-tools' to update." @echo "errcheck is already installed. Run 'make update-tools' to update."
else else
@echo "Installing errcheck" @echo "Installing errcheck"
go get -v $(ERRCHECK) go get -v $(ERRCHECK)
endif endif
ifdef UNPARAM_CHECK ifdef UNPARAM_CHECK
@echo "unparam is already installed. Run 'make update-tools' to update." @echo "unparam is already installed. Run 'make update-tools' to update."
else else
@echo "Installing unparam" @echo "Installing unparam"
go get -v $(UNPARAM) go get -v $(UNPARAM)
endif endif
ifdef GOYCLO_CHECK ifdef GOCYCLO_CHECK
@echo "goyclo is already installed. Run 'make update-tools' to update." @echo "goyclo is already installed. Run 'make update-tools' to update."
else else
@echo "Installing goyclo" @echo "Installing goyclo"
go get -v $(GOCYCLO) go get -v $(GOCYCLO)
endif endif
deps: deps:
@rm -rf vendor/ @rm -rf vendor/