public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: updated build-container with go1.11.

Browse Source
This commit is contained in:
Leonard Gram
2018-09-05 11:55:28 +02:00
parent 12c9860882
commit 8ea2f7f858
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/config.yml
+2 -2
View File
@@ -125,7 +125,7 @@ jobs:
build-all: build-all:
docker: docker:
- image: grafana/build-container:1.0.0 - image: grafana/build-container:build
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@@ -168,7 +168,7 @@ jobs:
build: build:
docker: docker:
- image: grafana/build-container:1.0.0 - image: grafana/build-container:build
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
scripts/build/build-all.sh
+4
View File
@@ -45,6 +45,10 @@ else
fi fi
echo "Building frontend" echo "Building frontend"
go run build.go ${OPT} build-frontend go run build.go ${OPT} build-frontend
# Load ruby, needed for packing with fpm
source /etc/profile.d/rvm.sh
echo "Packaging" echo "Packaging"
go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only latest go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only latest
#removing amd64 phantomjs bin for armv7/arm64 packages #removing amd64 phantomjs bin for armv7/arm64 packages
scripts/build/build.sh
+3
View File
@@ -33,5 +33,8 @@ fi
echo "Building frontend" echo "Building frontend"
go run build.go ${OPT} build-frontend go run build.go ${OPT} build-frontend
# Load ruby, needed for packing with fpm
source /etc/profile.d/rvm.sh
echo "Packaging" echo "Packaging"
go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only latest go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only latest