status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-09 13:26:07 +00:00
Code Issues Projects Releases Wiki Activity

Update to Go 1.11.4 and UI build container (#5257)

Browse Source 
* Update to Go 1.11.4

* Update to Go 1.11.4 for travis

* Update UI build to fix ember issues.
This commit is contained in:
Matt Keeler 2019-01-23 12:56:39 -05:00 committed by GitHub
parent c5812c376b
commit ec712b7ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -3,7 +3,7 @@ language: go
go: go:
# Please keep this in-sync with the go version we build against in # Please keep this in-sync with the go version we build against in
# build-support/docker/Build-Go.dockerfile. # build-support/docker/Build-Go.dockerfile.
- "1.11.1" - "1.11.4"
branches: branches:
only: only:

2
build-support/docker/Build-Go.dockerfile
View File

@ -1,4 +1,4 @@
ARG GOLANG_VERSION=1.11.1 ARG GOLANG_VERSION=1.11.4
FROM golang:${GOLANG_VERSION} FROM golang:${GOLANG_VERSION}
ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \ ARG GOTOOLS="github.com/elazarl/go-bindata-assetfs/... \

10
build-support/docker/Build-UI.dockerfile
View File

@ -1,12 +1,12 @@
ARG ALPINE_VERSION=3.7 ARG ALPINE_VERSION=3.8
FROM alpine:${ALPINE_VERSION} FROM alpine:${ALPINE_VERSION}
ARG NODEJS_VERSION=8.9.3-r1 ARG NODEJS_VERSION=8.14.0-r0
ARG MAKE_VERSION=4.2.1-r0 ARG MAKE_VERSION=4.2.1-r2
ARG YARN_VERSION=1.7.0 ARG YARN_VERSION=1.13
RUN apk update && \ 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 config set unsafe-perm true && \
npm install --global yarn@${YARN_VERSION} && \ npm install --global yarn@${YARN_VERSION} && \
mkdir /consul-src mkdir /consul-src