3
0

Fix makefile, dockerfile auth=>system

This commit is contained in:
Denis Arh 2018-11-06 10:13:08 +01:00
parent 8dd11b6b0e
commit 6c021fb3f9
2 changed files with 5 additions and 5 deletions

View File

@ -11,7 +11,7 @@ RUN apk update && apk upgrade && apk add --no-cache git
RUN mkdir /build; \
go build \
-ldflags "-X github.com/crusttech/crust/internal/version.BuildTime="`date +%FT%T%z`" -X github.com/crusttech/crust/internal/version.Version="`git describe --always --tags` \
-o /build/auth cmd/auth/*.go
-o /build/system cmd/system/*.go
## target image
FROM alpine:3.7
@ -22,4 +22,4 @@ WORKDIR /crust
COPY --from=builder /build/* /crust/
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
ENTRYPOINT /crust/auth
ENTRYPOINT /crust/system

View File

@ -5,8 +5,8 @@ PKG = "github.com/$(shell cat .project)"
GO = go
GOGET = $(GO) get -u
BASEPKGS = rbac auth crm sam
IMAGES = auth crm sam
BASEPKGS = rbac system crm sam
IMAGES = system crm sam
########################################################################################################################
# Tool bins
@ -128,7 +128,7 @@ mocks: $(GOMOCK)
$(MOCKGEN) -package service -source sam/service/message.go -destination sam/service/message_mock_test.go
$(MOCKGEN) -package service -source sam/service/organisation.go -destination sam/service/organisation_mock_test.go
$(MOCKGEN) -package service -source sam/service/team.go -destination sam/service/team_mock_test.go
$(MOCKGEN) -package service -source auth/service/user.go -destination auth/service/user_mock_test.go
$(MOCKGEN) -package service -source system/service/user.go -destination system/service/user_mock_test.go
########################################################################################################################