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

Drone: Upgrade drone-grafana-docker image (#27911)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-09-29 21:34:34 +02:00 committed by GitHub
parent d745a66a18
commit 702fb1edd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -160,7 +160,7 @@ steps:
- package
- name: build-docker-images
image: grafana/drone-grafana-docker:0.3.1
image: grafana/drone-grafana-docker:0.3.2
settings:
archs: amd64
dry_run: true
@ -455,7 +455,7 @@ steps:
- package
- name: build-docker-images
image: grafana/drone-grafana-docker:0.3.1
image: grafana/drone-grafana-docker:0.3.2
settings:
edition: oss
password:
@ -466,7 +466,7 @@ steps:
- copy-packages-for-docker
- name: build-docker-images-ubuntu
image: grafana/drone-grafana-docker:0.3.1
image: grafana/drone-grafana-docker:0.3.2
settings:
edition: oss
password:

5
packaging/docker/Dockerfile
View File

@ -3,10 +3,13 @@ FROM ${BASE_IMAGE}
ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
# Make sure we have Gnu tar
RUN apk add --no-cache tar
COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
# Change to tar xfzv to make tar print every file it extracts
RUN mkdir /tmp/grafana && tar xfz /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
RUN mkdir /tmp/grafana && tar xzf /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
FROM ${BASE_IMAGE}

2
packaging/docker/ubuntu.Dockerfile
View File

@ -5,7 +5,7 @@ ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"
COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
RUN mkdir /tmp/grafana && tar xfz /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
RUN mkdir /tmp/grafana && tar xzf /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
FROM ${BASE_IMAGE}

2
scripts/lib.star
View File

@ -1,6 +1,6 @@
build_image = 'grafana/build-container:1.2.27'
publish_image = 'grafana/grafana-ci-deploy:1.2.6'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
alpine_image = 'alpine:3.12'
windows_image = 'mcr.microsoft.com/windows:1809'
grabpl_version = '0.5.13'