diff --git a/.drone.yml b/.drone.yml index 4dff0254b78..10c688c7c85 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 ... diff --git a/Dockerfile b/Dockerfile index 2571aaa428a..0c89168df9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 " diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile index 8f515eca4af..85d77918b2c 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13 +FROM alpine:3.14.1 USER root diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 70c6e36f4a2..052814b2bcf 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -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" diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index ffad5199af3..8175ff80cc1 100755 --- a/packaging/docker/build.sh +++ b/packaging/docker/build.sh @@ -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" diff --git a/scripts/lib.star b/scripts/lib.star index 8db3aa29a62..6a9516a61b6 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -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'