diff --git a/.travis.yml b/.travis.yml index 8e3352ec86..a494e73d12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: go go: # Please keep this in-sync with the go version we build against in # build-support/docker/Build-Go.dockerfile. - - "1.11.1" + - "1.11.4" branches: only: diff --git a/build-support/docker/Build-Go.dockerfile b/build-support/docker/Build-Go.dockerfile index 7a61f0be10..ffe81925a3 100644 --- a/build-support/docker/Build-Go.dockerfile +++ b/build-support/docker/Build-Go.dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.11.1 +ARG GOLANG_VERSION=1.11.4 FROM golang:${GOLANG_VERSION} ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \ diff --git a/build-support/docker/Build-UI.dockerfile b/build-support/docker/Build-UI.dockerfile index 623a24ff16..fd81560515 100644 --- a/build-support/docker/Build-UI.dockerfile +++ b/build-support/docker/Build-UI.dockerfile @@ -1,12 +1,12 @@ -ARG ALPINE_VERSION=3.7 +ARG ALPINE_VERSION=3.8 FROM alpine:${ALPINE_VERSION} -ARG NODEJS_VERSION=8.9.3-r1 -ARG MAKE_VERSION=4.2.1-r0 -ARG YARN_VERSION=1.7.0 +ARG NODEJS_VERSION=8.14.0-r0 +ARG MAKE_VERSION=4.2.1-r2 +ARG YARN_VERSION=1.13 RUN apk update && \ - apk add nodejs=${NODEJS_VERSION} nodejs-npm=${NODEJS_VERSION} make=${MAKE_VERSION} rsync && \ + apk add nodejs=${NODEJS_VERSION} nodejs-npm=${NODEJS_VERSION} make=${MAKE_VERSION} && \ npm config set unsafe-perm true && \ npm install --global yarn@${YARN_VERSION} && \ mkdir /consul-src