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: Fixed incorrect permissions for repo folders in ci-deploy. (#16360)

Browse Source
This commit is contained in:
Leonard Gram 2019-04-03 15:24:34 +02:00 committed by GitHub
parent 6ef844daa4
commit 6baba64935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 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.1 - image: grafana/grafana-ci-deploy:1.2.2
steps: steps:
- attach_workspace: - attach_workspace:
at: . at: .
@ -347,7 +347,7 @@ jobs:
deploy-enterprise-release: deploy-enterprise-release:
docker: docker:
- image: grafana/grafana-ci-deploy:1.2.1 - image: grafana/grafana-ci-deploy:1.2.2
steps: steps:
- checkout - checkout
- attach_workspace: - attach_workspace:
@ -380,7 +380,7 @@ jobs:
deploy-master: deploy-master:
docker: docker:
- image: grafana/grafana-ci-deploy:1.2.1 - image: grafana/grafana-ci-deploy:1.2.2
steps: steps:
- attach_workspace: - attach_workspace:
at: . at: .
@ -411,7 +411,7 @@ jobs:
deploy-release: deploy-release:
docker: docker:
- image: grafana/grafana-ci-deploy:1.2.1 - image: grafana/grafana-ci-deploy:1.2.2
steps: steps:
- checkout - checkout
- attach_workspace: - attach_workspace:

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

@ -18,7 +18,9 @@ RUN pip install -U awscli crcmod && \
apt-get autoremove -y && \ apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
ln -s /opt/google-cloud-sdk/bin/gsutil /usr/bin/gsutil && \ ln -s /opt/google-cloud-sdk/bin/gsutil /usr/bin/gsutil && \
ln -s /opt/google-cloud-sdk/bin/gcloud /usr/bin/gcloud ln -s /opt/google-cloud-sdk/bin/gcloud /usr/bin/gcloud && \
mkdir -p /deb-repo /rpm-repo && \
chown circleci:circleci /deb-repo /rpm-repo
COPY --from=0 /go/bin/aptly /usr/local/bin/aptly COPY --from=0 /go/bin/aptly /usr/local/bin/aptly

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

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