From 6c021fb3f9808e810b6062d0e044a36c75c8e81a Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Tue, 6 Nov 2018 10:13:08 +0100 Subject: [PATCH] Fix makefile, dockerfile auth=>system --- Dockerfile.auth => Dockerfile.system | 4 ++-- Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename Dockerfile.auth => Dockerfile.system (90%) diff --git a/Dockerfile.auth b/Dockerfile.system similarity index 90% rename from Dockerfile.auth rename to Dockerfile.system index fac1962e4..701d0ad13 100644 --- a/Dockerfile.auth +++ b/Dockerfile.system @@ -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 diff --git a/Makefile b/Makefile index 58967eb7f..42ff12cd8 100644 --- a/Makefile +++ b/Makefile @@ -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 ########################################################################################################################