Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
gfr10598 committed May 17, 2018
1 parent 79fa2d2 commit 516b520
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ script:
- $HOME/gopath/bin/goveralls -coverprofile=merge.cov -service=travis-ci

# Docker build
- docker build --build-args COMMIT=$TRAVIS_COMMIT -t mlab/tcpinfo .
- docker build --build-arg COMMIT=$TRAVIS_COMMIT -t mlab/tcpinfo .

#################################################################################
# Deployment Section
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ RUN apk update && apk add bash git unzip
WORKDIR /go/src/github.com/m-lab
RUN git clone https://github.com/m-lab/tcp-info
WORKDIR tcp-info
# allows override with --build-args COMMIT=branch-or-commit, defaults to $TRAVIS_COMMIT or master
ARG COMMIT=${COMMIT}
# allows override with --build-args COMMIT=branch-or-commit, defaults to master
ARG COMMIT=master
RUN echo $COMMIT
RUN git checkout $COMMIT

# List all of the go imports, excluding any in this repo, and run go get to import them.
Expand Down

0 comments on commit 516b520

Please sign in to comment.