From 463e8ffd92ae45599300ac9428551b47744e551b Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Tue, 30 Jun 2020 14:26:02 +0200
Subject: [PATCH] Docker: Upgrade to base on Alpine 3.12 (#25936)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
---
 Dockerfile                  | 6 +++---
 packaging/docker/Dockerfile | 2 +-
 packaging/docker/build.sh   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f90f08aae7a..7fbe9715f45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.16.3-alpine3.11 as js-builder
+FROM node:12.18.1-alpine3.12 as js-builder
 
 WORKDIR /usr/src/app/
 
@@ -16,7 +16,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
-FROM golang:1.14.2-alpine3.11 as go-builder
+FROM golang:1.14.4-alpine3.12 as go-builder
 
 RUN apk add --no-cache gcc g++
 
@@ -32,7 +32,7 @@ COPY build.go package.json ./
 RUN go run build.go build
 
 # Final stage
-FROM alpine:3.11
+FROM alpine:3.12
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index b858aab1b1d..fc84033f4b1 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.11
+ARG BASE_IMAGE=alpine:3.12
 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 28568a3781e..dcad1fa2c69 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.11"
+    base_image="${base_arch}alpine:3.12"
   else
     libc=""
     dockerfile="ubuntu.Dockerfile"