Skip to content

Commit

Permalink
go 1.14. dockerhub builds
Browse files Browse the repository at this point in the history
  • Loading branch information
kbudde committed May 25, 2020
1 parent 185c9dd commit da2d5d8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .promu.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
go:
version: "1.13"
version: "1.14"
verbose: true
repository:
path: github.com/kbudde/rabbitmq_exporter
Expand Down
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ services:

language: go
go:
- "1.13"
- "1.14"

env:
global:
- PATH=/home/travis/gopath/bin:$PATH
- COMMIT=${TRAVIS_COMMIT::8}
- REPO=kbudde/rabbitmq-exporter
# - REPO=kbudde/rabbitmq-exporter
- GO111MODULE=on
before_install:
- go get github.com/mitchellh/gox
Expand All @@ -28,12 +28,12 @@ install:
script:
- go test -tags integration -covermode=count -coverprofile=coverage.out ./

after_success:
#Build Docker image
- docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
- make docker DOCKER_IMAGE_NAME=$REPO DOCKER_IMAGE_TAG=$TAG
- docker push $REPO
# after_success:
# #Build Docker image
# - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
# - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
# - make docker DOCKER_IMAGE_NAME=$REPO DOCKER_IMAGE_TAG=$TAG
# - docker push $REPO

#Build dist releases
- if [ -n "$TRAVIS_TAG" ]; then make tarballs && promu release .tarballs ; fi
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Accept the Go version for the image to be set as a build argument.
# Default to Go 1.11
ARG GO_VERSION=1.13
ARG GO_VERSION=1.14

# First stage: build the executable.
FROM golang:${GO_VERSION}-alpine AS builder
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ require (
gotest.tools v2.2.0+incompatible // indirect
)

go 1.13
go 1.14

0 comments on commit da2d5d8

Please sign in to comment.