IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

build: imported latest changes from grafana-docker.

Browse Source
This commit is contained in:
Leonard Gram
2018-07-30 14:05:56 +02:00
parent e848930476
commit 580e2c36d1
6 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.circleci/config.yml
View File

@@ -182,7 +182,7 @@ jobs:
paths:
- dist/grafana*
build-docker:
grafana-docker-master:
docker:
- image: docker:stable-git
steps:
@@ -191,9 +191,8 @@ jobs:
at: .
- setup_remote_docker
- run: docker info
- run: echo $GRAFANA_VERSION
- run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
- run: cd packaging/docker && ./build.sh ${GRAFANA_VERSION}
- run: cd packaging/docker && ./build-deploy.sh "grafana-docker-${CIRCLE_SHA1}"
build-enterprise:
docker:
@@ -362,7 +361,7 @@ workflows:
filters: *filter-not-release-or-master
- postgres-integration-test:
filters: *filter-not-release-or-master
- build-docker:
- grafana-docker-master:
requires:
- build
- test-backend