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

Merge pull request #16069 from xlson/ci-deploy-speedup

Browse Source 
build: crcmod speedups rsync to gcp for deploy.
This commit is contained in:
Leonard Gram 2019-03-19 14:13:15 +01:00 committed by GitHub
commit 95f7a91328
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -322,7 +322,7 @@ jobs:
deploy-enterprise-master: deploy-enterprise-master:
docker: docker:
- image: grafana/grafana-ci-deploy:1.2.0 - image: grafana/grafana-ci-deploy:1.2.1
steps: steps:
- attach_workspace: - attach_workspace:
at: . at: .
@ -345,7 +345,7 @@ jobs:
deploy-enterprise-release: deploy-enterprise-release:
docker: docker:
- image: grafana/grafana-ci-deploy:1.2.0 - image: grafana/grafana-ci-deploy:1.2.1
steps: steps:
- checkout - checkout
- attach_workspace: - attach_workspace:
@ -378,7 +378,7 @@ jobs:
deploy-master: deploy-master:
docker: docker:
- image: grafana/grafana-ci-deploy:1.2.0 - image: grafana/grafana-ci-deploy:1.2.1
steps: steps:
- attach_workspace: - attach_workspace:
at: . at: .
@ -409,7 +409,7 @@ jobs:
deploy-release: deploy-release:
docker: docker:
- image: grafana/grafana-ci-deploy:1.2.0 - image: grafana/grafana-ci-deploy:1.2.1
steps: steps:
- checkout - checkout
- attach_workspace: - attach_workspace:

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

@ -10,7 +10,7 @@ FROM circleci/python:2.7-stretch
USER root USER root
RUN pip install awscli && \ RUN pip install -U awscli crcmod && \
curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-222.0.0-linux-x86_64.tar.gz | \ curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-222.0.0-linux-x86_64.tar.gz | \
tar xvzf - -C /opt && \ tar xvzf - -C /opt && \
apt update && \ apt update && \

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

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