Update go and alpine versions (#4886)

* Update go and alpine versions * Update changelog * Work around go get issue * Update the go-bindata path
influxdata · Dec 14, 2018 · b4ae793 · b4ae793
1 parent dd1620e
commit b4ae793
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,7 +34,7 @@ version: 2
 jobs:
   build:
     environment:
-      DOCKER_TAG: chronograf-20180327
+      DOCKER_TAG: chronograf-20181214
     machine: true
     steps:
       - checkout
@@ -56,7 +56,7 @@ jobs:
 
   deploy-nightly:
     environment:
-      DOCKER_TAG: chronograf-20180327
+      DOCKER_TAG: chronograf-20181214
     machine: true
     steps:
       - attach_workspace:
@@ -83,7 +83,7 @@ jobs:
 
   deploy-pre-release:
     environment:
-      DOCKER_TAG: chronograf-20180327
+      DOCKER_TAG: chronograf-20181214
     machine: true
     steps:
       - attach_workspace:
@@ -112,7 +112,7 @@ jobs:
 
   deploy-release:
     environment:
-      DOCKER_TAG: chronograf-20180327
+      DOCKER_TAG: chronograf-20181214
     machine: true
     steps:
       - attach_workspace:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.7.5 [2018-12-14]
+### Bug Fixes
+1. [4886](https://github.com/influxdata/chronograf/pull/4886): Update go, node, and alpine versions
+
 ## v1.7.4 [2018-12-12]
 
 ### Features

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM gliderlabs/alpine
+FROM alpine:3.8
 MAINTAINER Chris Goller <[email protected]>
 
 ENV PROTOBOARDS_PATH /usr/share/chronograf/protoboards

diff --git a/Makefile b/Makefile
@@ -70,7 +70,7 @@ dep: .jsdep .godep
 .godep:
 ifndef GOBINDATA
 	@echo "Installing go-bindata"
-	go get -u github.com/kevinburke/go-bindata/...
+	go get -u github.com/kevinburke/go-bindata/go-bindata
 endif
 	@touch .godep
 

diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build
@@ -20,7 +20,7 @@ RUN pip install boto requests python-jose --upgrade
 RUN gem install fpm
 
 # Install node
-ENV NODE_VERSION v8.10.0
+ENV NODE_VERSION v10.14.2
 RUN wget -q https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz; \
    tar -xvf node-${NODE_VERSION}-linux-x64.tar.gz -C / --strip-components=1; \
    rm -f node-${NODE_VERSION}-linux-x64.tar.gz
@@ -31,7 +31,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
 
 # Install go
 ENV GOPATH /root/go
-ENV GO_VERSION 1.10
+ENV GO_VERSION 1.11.3
 ENV GO_ARCH amd64
 RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
    tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \