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

DevEnv: updates build-ci-deploy dockerfile and CI config to include yarn (#22809)

Browse Source 
* DevEnv: updates build-ci-deploy dockerfile

* DevEnv: updates build-ci-deploy dockerfile version in circleci config
This commit is contained in:
Lukas Siatka 2020-03-16 15:37:44 +01:00 committed by GitHub
parent 46165a7f7b
commit 935ec07cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -29,7 +29,7 @@ executors:
- image: grafana/build-container:1.2.13 - image: grafana/build-container:1.2.13
grafana-publish: grafana-publish:
docker: docker:
- image: grafana/grafana-ci-deploy:1.2.3 - image: grafana/grafana-ci-deploy:1.2.4
docker: docker:
machine: machine:
image: circleci/classic:201808-01 image: circleci/classic:201808-01

2
scripts/build/ci-deploy/Dockerfile
View File

@ -6,7 +6,7 @@ RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-de
git reset --hard a64807efdaf5e380bfa878c71bc88eae10d62be1 && \ git reset --hard a64807efdaf5e380bfa878c71bc88eae10d62be1 && \
make install make install
FROM circleci/python:2.7-stretch FROM circleci/python:2.7-stretch-node
USER root USER root

2
scripts/build/ci-deploy/build-deploy.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
_version="1.2.3" _version="1.2.4"
_tag="grafana/grafana-ci-deploy:${_version}" _tag="grafana/grafana-ci-deploy:${_version}"
docker build -t $_tag . docker build -t $_tag .