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

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}
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
libc="-musl"
dockerfile="Dockerfile"
base_image="${base_arch}alpine:3.13"
base_image="${base_arch}alpine:3.14.1"
else
libc=""
dockerfile="ubuntu.Dockerfile"