Merge ee150a6 into 778c56c

linkedin · Apr 29, 2019 · c17b6d7 · c17b6d7
2 parents 778c56c + ee150a6
commit c17b6d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,12 @@
+dist: xenial
 language: go
-
 go:
-  - 1.11.5
-  - master
+- 1.11.x
+- 1.12.x
+- master
 
 env:
-  - DEP_VERSION="0.5.0"
+  - DEP_VERSION="0.5.1"
 
 sudo: required
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM golang:1.11-alpine as builder
+FROM golang:1.12-alpine as builder
 
-ENV DEP_VERSION="0.5.0"
+ENV DEP_VERSION="0.5.1"
 RUN apk add --no-cache git curl gcc libc-dev && \
 	curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep && \
 	chmod +x $GOPATH/bin/dep && \
@@ -18,4 +18,4 @@ WORKDIR /app
 COPY --from=builder /tmp/burrow /app/
 ADD /docker-config/burrow.toml /etc/burrow/
 
-CMD ["/app/burrow", "--config-dir", "/etc/burrow"]
+CMD ["/app/burrow", "--config-dir", "/etc/burrow"]