public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[8.1.x] Backport 38088 to v8.1.x (#38491)

Browse Source 
* Backport 38088

* Sign drone

Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
This commit is contained in:
Dimitris SotirakisandKevin Minehart authored and GitHub committed 2021-08-24 14:44:37 +03:00
1 parent 7964cc6789
commit a4b4958279
6 files changed
+18 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.drone.yml
+12 -12
View File
@@ -9,7 +9,7 @@ platform:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -252,7 +252,7 @@ platform:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -637,7 +637,7 @@ platform:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -722,7 +722,7 @@ platform:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -1082,7 +1082,7 @@ clone:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -1580,7 +1580,7 @@ platform:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -1685,7 +1685,7 @@ platform:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -2034,7 +2034,7 @@ clone:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -2526,7 +2526,7 @@ platform:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -2631,7 +2631,7 @@ platform:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -2951,7 +2951,7 @@ clone:
steps:
- name: identify-runner
image: alpine:3.13
image: alpine:3.14.1
commands:
- echo $DRONE_RUNNER_NAME
@@ -3530,6 +3530,6 @@ get:
---
kind: signature
hmac: fd6943874a4ae13f506fae5e433bde587da4931b4c4fb62a600c9b5fb1da3eb9
hmac: 9dd42fb9f400af4fe9ef9a41788e1b1bf4f03ec7f291a4ed475f3cc2c7608fb4
...
Dockerfile
+2 -2
View File
@@ -1,4 +1,4 @@
FROM node:14.16.0-alpine3.13 as js-builder
FROM node:16-alpine3.14 as js-builder
WORKDIR /usr/src/app/
@@ -33,7 +33,7 @@ RUN go mod verify
RUN go run build.go build
# Final stage
FROM alpine:3.13
FROM alpine:3.14.1
LABEL maintainer="Grafana team <hello@grafana.com>"
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM alpine:3.13
FROM alpine:3.14.1
USER root
packaging/docker/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=alpine:3.13
ARG BASE_IMAGE=alpine:3.14.1
FROM ${BASE_IMAGE}
ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
packaging/docker/build.sh
+1 -1
View File
@@ -60,7 +60,7 @@ docker_build () {
if [ $UBUNTU_BASE = "0" ]; then
libc="-musl"
dockerfile="Dockerfile"
base_image="${base_arch}alpine:3.13"
base_image="${base_arch}alpine:3.14.1"
else
libc=""
dockerfile="ubuntu.Dockerfile"
scripts/lib.star
+1 -1
View File
@@ -5,7 +5,7 @@ build_image = 'grafana/build-container:1.4.1'
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
alpine_image = 'alpine:3.13'
alpine_image = 'alpine:3.14.1'
windows_image = 'mcr.microsoft.com/windows:1809'
dockerize_version = '0.6.1'
wix_image = 'grafana/ci-wix:0.1.1'