DeforaNetworks/corteza
3
0
Fork 0
Code Activity

upd(all): docker image build improvements

Browse Source
This commit is contained in:
Tit Petric
2019-04-26 20:37:03 +02:00
parent 78f9b7b53a
commit 619fa4de02
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.drone.yml
View File

@@ -94,15 +94,20 @@ steps:
AUTH_OIDC_ENABLED: 0
AUTH_JWT_SECRET: bRxJ37sJ6Qu4
commands:
- go fmt ./cmd/... ./internal/... ./crm/... ./messaging/... ./system/...
- make mocks
- make codegen
- 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/crust-$GOOS-$GOARCH cmd/crust/*.go
- 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/crm-$GOOS-$GOARCH cmd/crm/*.go
- 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/messaging-$GOOS-$GOARCH cmd/messaging/*.go
- 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/system-$GOOS-$GOARCH cmd/system/*.go
- 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/system-cli-$GOOS-$GOARCH cmd/system-cli/*.go
# check all tests are able to build
- wait-for-it.sh -t 60 --strict crust-db:3306 -- echo "Crust DB1 is up"
- gotest -v --tags="migrations" ./system/db/...
- gotest -v --tags="migrations" ./crm/db/...
- gotest -v --tags="migrations" ./messaging/db/...
- go test -run=^$ --tags="unit integration external" ./cmd/... ./internal/... ./crm/... ./messaging/... ./system/...
- gotest -failfast --coverprofile=coverage.txt -v --tags="unit integration external" ./internal/... ./system/... ./crm/... ./messaging/...
- gotest -failfast --coverprofile=coverage.txt -v --tags="unit integration" ./internal/... ./system/... ./crm/... ./messaging/...
- name: coverage
image: plugins/codecov
settings:

4
Dockerfile.api-crm
View File

@@ -1,5 +1,5 @@
## builder image
FROM golang:1.10-alpine AS builder
FROM crusttech/crust-builder AS builder
WORKDIR /go/src/github.com/crusttech/crust
@@ -7,7 +7,6 @@ ENV CGO_ENABLED=0
COPY . .
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` \
@@ -16,7 +15,6 @@ RUN mkdir /build; \
## target image
FROM alpine:3.7
ENV PATH="/crust:{$PATH}"
WORKDIR /crust
COPY --from=builder /build/* /crust/

3
Dockerfile.api-messaging
View File

@@ -1,5 +1,5 @@
## builder image
FROM golang:1.10-alpine AS builder
FROM crusttech/crust-builder AS builder
WORKDIR /go/src/github.com/crusttech/crust
@@ -16,7 +16,6 @@ RUN mkdir /build; \
## target image
FROM alpine:3.7
ENV PATH="/crust:{$PATH}"
WORKDIR /crust
COPY --from=builder /build/* /crust/

4
Dockerfile.api-system
View File

@@ -1,5 +1,5 @@
## builder image
FROM golang:1.10-alpine AS builder
FROM crusttech/crust-builder AS builder
WORKDIR /go/src/github.com/crusttech/crust
@@ -7,7 +7,6 @@ ENV CGO_ENABLED=0
COPY . .
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` \
@@ -19,7 +18,6 @@ RUN mkdir /build; \
## target image
FROM alpine:3.7
ENV PATH="/crust:{$PATH}"
WORKDIR /crust
COPY --from=builder /build/* /crust/

3
Dockerfile.crust
View File

@@ -1,12 +1,11 @@
## == builder image ==
FROM golang:1.12-alpine AS builder
FROM crust-builder AS builder
WORKDIR /go/src/github.com/crusttech/crust
COPY . .
RUN apk add --no-cache git
RUN mkdir /build; \
CGO_ENABLED=0 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` \

8
Dockerfile.crust-builder
View File

@@ -1,8 +1,8 @@
FROM golang:1.12-alpine
RUN apk add --no-cache git make bash && \
go get -u github.com/golang/mock/gomock && \
go get -u github.com/golang/mock/mockgen && \
go get -u github.com/rakyll/gotest && \
go get -u github.com/goware/statik && \
echo "installing gomock" && go get -u github.com/golang/mock/gomock && \
echo "installing mockgen" && go get -u github.com/golang/mock/mockgen && \
echo "installing gotest" && go get -u github.com/rakyll/gotest && \
echo "installing goware/statik" && go get -u github.com/goware/statik && \
cd /usr/local/bin && wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && chmod a+x wait-for-it.sh