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

Docker: Update base alpine version (fix CVE-2021-36159) (#38088)

Browse Source 
* update base alpine version and update apk packages in Dockerfile

* update base alpine version

* don't need to apk update

* remove space

* Update to alpine 3.14.1

Co-authored-by: Malcolm Holmes <mdh@odoko.co.uk>
This commit is contained in:
Kevin Minehart
2021-08-20 06:54:03 -05:00
committed by GitHub
parent d9a2dd8a4b
commit b3c4b20953
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.drone.yml
View File

@@ -9,7 +9,7 @@ platform:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -253,7 +253,7 @@ platform:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -636,7 +636,7 @@ platform:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -724,7 +724,7 @@ platform:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -1083,7 +1083,7 @@ clone:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -1579,7 +1579,7 @@ platform:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -1687,7 +1687,7 @@ platform:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -2035,7 +2035,7 @@ clone:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -2525,7 +2525,7 @@ platform:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -2633,7 +2633,7 @@ platform:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -2952,7 +2952,7 @@ clone:
steps: steps:
- name: identify-runner - name: identify-runner
image: alpine:3.13 image: alpine:3.14.1
commands: commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
@@ -3529,6 +3529,6 @@ get:
--- ---
kind: signature kind: signature
hmac: 57545e503a446cf31e661b472e3145ccf1c59c811708047bca0d6ba241ba3fdb hmac: 80b19bbc75555ea1f675017ec9b98241b331a624a5f4ee7f3b169b75258d51be
... ...

4
Dockerfile
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/ WORKDIR /usr/src/app/
@@ -33,7 +33,7 @@ RUN go mod verify
RUN go run build.go build RUN go run build.go build
# Final stage # Final stage
FROM alpine:3.13 FROM alpine:3.14.1
LABEL maintainer="Grafana team <hello@grafana.com>" LABEL maintainer="Grafana team <hello@grafana.com>"

2
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.13 FROM alpine:3.14.1
USER root USER root

2
packaging/docker/Dockerfile
View File

@@ -1,4 +1,4 @@
ARG BASE_IMAGE=alpine:3.13 ARG BASE_IMAGE=alpine:3.14.1
FROM ${BASE_IMAGE} FROM ${BASE_IMAGE}
ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz" ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"

2
packaging/docker/build.sh
View File

@@ -60,7 +60,7 @@ docker_build () {
if [ $UBUNTU_BASE = "0" ]; then if [ $UBUNTU_BASE = "0" ]; then
libc="-musl" libc="-musl"
dockerfile="Dockerfile" dockerfile="Dockerfile"
base_image="${base_arch}alpine:3.13" base_image="${base_arch}alpine:3.14.1"
else else
libc="" libc=""
dockerfile="ubuntu.Dockerfile" dockerfile="ubuntu.Dockerfile"

2
scripts/lib.star
View File

@@ -5,7 +5,7 @@ build_image = 'grafana/build-container:1.4.1'
publish_image = 'grafana/grafana-ci-deploy:1.3.1' publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' 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' windows_image = 'mcr.microsoft.com/windows:1809'
dockerize_version = '0.6.1' dockerize_version = '0.6.1'
wix_image = 'grafana/ci-wix:0.1.1' wix_image = 'grafana/ci-wix:0.1.1'