From 0ecddabb76af8ec3f80beb1856e3035bfbb7b429 Mon Sep 17 00:00:00 2001 From: blazhovsky Date: Wed, 25 Dec 2019 16:43:10 +0100 Subject: [PATCH] added go mod support --- .travis.yml | 9 +++++---- Dockerfile | 10 ++++------ go.mod | 10 ++++++++++ go.sum | 12 ++++++++++++ 4 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 go.mod create mode 100644 go.sum diff --git a/.travis.yml b/.travis.yml index 40c6a0d..f7c5d04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,17 @@ sudo: required env: global: - CC_TEST_REPORTER_ID=${CODE_CLIMATE_REPORTER_ID} + - GO_ENABLED=0 + - GO111MODULE=on + - GOOS=linux + - GOARCH=amd64 - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi) - CURRENT_BRANCH=$(if [ ! -z "$TRAVIS_TAG" ]; then echo $TRAVIS_TAG; else echo "master"; fi) language: go go: - - 1.10.x + - 1.13.x before_install: - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - @@ -18,9 +22,6 @@ before_install: - sudo apt-get -y install docker-ce - go get github.com/axw/gocov/gocov - go get github.com/AlekSi/gocov-xml - - go get github.com/keitaroinc/goa/... - - go get github.com/Microkubes/microservice-tools/... - - go get gopkg.in/gomail.v2 before_script: - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter diff --git a/Dockerfile b/Dockerfile index f6b4125..6765585 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,16 @@ ### Multi-stage build -FROM golang:1.10-alpine3.7 as build +FROM golang:1.13.5-alpine3.10 as build RUN apk --no-cache add git -RUN go get -u -v gopkg.in/gomail.v2 && \ - go get -u -v github.com/Microkubes/microservice-tools/... - COPY . /go/src/github.com/Microkubes/microservice-mail -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go install github.com/Microkubes/microservice-mail +RUN cd /go/src/github.com/Microkubes/microservice-mail && \ + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go install ### Main -FROM scratch +FROM alpine:3.10 ENV API_GATEWAY_URL="http://localhost:8001" diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..a7560a7 --- /dev/null +++ b/go.mod @@ -0,0 +1,10 @@ +module github.com/Microkubes/microservice-mail + +go 1.13 + +require ( + github.com/Microkubes/microservice-tools v1.1.0 + github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271 + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..91fb07c --- /dev/null +++ b/go.sum @@ -0,0 +1,12 @@ +github.com/Microkubes/microservice-tools v1.1.0 h1:0kyByC+JqVi/nDDp+eKYhDpgqdA1xvVP68wGIpcJDcQ= +github.com/Microkubes/microservice-tools v1.1.0/go.mod h1:9YPuF99237LdC2025udqFF82dzLl0jPvZEnXIAGJXBQ= +github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= +github.com/keitaroinc/goa v1.5.0/go.mod h1:/2wU1ZNwnOGEs2McuC3BMK59BD0nTRmZ2Uy61h/uuZY= +github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271 h1:WhxRHzgeVGETMlmVfqhRn8RIeeNoPr2Czh33I4Zdccw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= +gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= +gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= +gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=