From 8ea2f7f8581cc821e8e1b82ac3cd9dc8a2946026 Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Wed, 5 Sep 2018 11:55:28 +0200
Subject: [PATCH] build: updated build-container with go1.11.

---
 .circleci/config.yml       | 4 ++--
 scripts/build/build-all.sh | 4 ++++
 scripts/build/build.sh     | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b4480b4bade..fbc45e6abea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -125,7 +125,7 @@ jobs:
 
   build-all:
     docker:
-     - image: grafana/build-container:1.0.0
+     - image: grafana/build-container:build
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -168,7 +168,7 @@ jobs:
 
   build:
     docker:
-     - image: grafana/build-container:1.0.0
+     - image: grafana/build-container:build
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
diff --git a/scripts/build/build-all.sh b/scripts/build/build-all.sh
index 6029b14605a..0aaab2ce4a6 100755
--- a/scripts/build/build-all.sh
+++ b/scripts/build/build-all.sh
@@ -45,6 +45,10 @@ else
 fi
 echo "Building frontend"
 go run build.go ${OPT} build-frontend
+
+# Load ruby, needed for packing with fpm
+source /etc/profile.d/rvm.sh
+
 echo "Packaging"
 go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only latest
 #removing amd64 phantomjs bin for armv7/arm64 packages
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index a02f079dd72..d4c1c788b30 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -33,5 +33,8 @@ fi
 echo "Building frontend"
 go run build.go ${OPT} build-frontend
 
+# Load ruby, needed for packing with fpm
+source /etc/profile.d/rvm.sh
+
 echo "Packaging"
 go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only latest