diff --git a/.travis.yml b/.travis.yml index 17e48090..9cb6efc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,17 @@ install: - docker-compose --version script: - - docker build --build-arg COVERALLS_TOKEN=$COVERALLS_TOKEN --build-arg TRAVIS_JOB_ID=$TRAVIS_JOB_ID --build-arg TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST --build-arg TRAVIS_BRANCH=$TRAVIS_BRANCH . + - docker build + --build-arg COVERALLS_TOKEN=$COVERALLS_TOKEN + --build-arg CI=$CI + --build-arg TRAVIS=$TRAVIS + --build-arg TRAVIS_BRANCH=$TRAVIS_BRANCH + --build-arg TRAVIS_COMMIT=$TRAVIS_COMMIT + --build-arg TRAVIS_JOB_ID=$TRAVIS_JOB_ID + --build-arg TRAVIS_JOB_NUMBER=$TRAVIS_JOB_NUMBER + --build-arg TRAVIS_OS_NAME=$TRAVIS_OS_NAME + --build-arg TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST + --build-arg TRAVIS_PULL_REQUEST_SHA=$TRAVIS_PULL_REQUEST_SHA + --build-arg TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG + --build-arg TRAVIS_TAG=$TRAVIS_TAG + . diff --git a/Dockerfile b/Dockerfile index e3a05040..a2a84df5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,17 @@ FROM umputun/baseimage:buildgo-latest as build-backend ARG COVERALLS_TOKEN -ARG TRAVIS_JOB_ID -ARG TRAVIS_PULL_REQUEST +ARG CI +ARG TRAVIS ARG TRAVIS_BRANCH +ARG TRAVIS_COMMIT +ARG TRAVIS_JOB_ID +ARG TRAVIS_JOB_NUMBER +ARG TRAVIS_OS_NAME +ARG TRAVIS_PULL_REQUEST +ARG TRAVIS_PULL_REQUEST_SHA +ARG TRAVIS_REPO_SLUG +ARG TRAVIS_TAG WORKDIR /go/src/github.com/umputun/remark @@ -21,8 +29,7 @@ RUN mkdir -p target && /script/coverage.sh RUN if [ "x$COVERALLS_TOKEN" = "x" ] ; then \ echo coverall not enabled ; \ - else go get github.com/mattn/goveralls && \ - goveralls -coverprofile=.cover/cover.out -service=travis-ci -repotoken $COVERALLS_TOKEN; fi + else goveralls -coverprofile=.cover/cover.out -service=travis-ci -repotoken $COVERALLS_TOKEN; fi RUN go build -o remark -ldflags "-X main.revision=$(git rev-parse --abbrev-ref HEAD)-$(git describe --abbrev=7 --always --tags)-$(date +%Y%m%d-%H:%M:%S) -s -w" ./app