From 4277e4d17755a59870a4930ba86994d35562fd72 Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Mon, 14 Dec 2020 22:01:46 +0100
Subject: [PATCH] Chore: Upgrade Ubuntu to 20.04 (#29822)

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

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index c01c54a7c55..fd73e2e1fbd 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -34,7 +34,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
-FROM ubuntu:19.10
+FROM ubuntu:20.04
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 EXPOSE 3000
diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh
index 5312ae7e49d..956cba20c8b 100755
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
@@ -64,7 +64,7 @@ docker_build () {
   else
     libc=""
     dockerfile="ubuntu.Dockerfile"
-    base_image="${base_arch}ubuntu:19.10"
+    base_image="${base_arch}ubuntu:20.04"
   fi
 
   grafana_tgz="grafana-latest.linux-${arch}${libc}.tar.gz"
diff --git a/packaging/docker/ubuntu.Dockerfile b/packaging/docker/ubuntu.Dockerfile
index c9a745acd50..84e8e4f88e1 100644
--- a/packaging/docker/ubuntu.Dockerfile
+++ b/packaging/docker/ubuntu.Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ubuntu:19.10
+ARG BASE_IMAGE=ubuntu:20.04
 FROM ${BASE_IMAGE} AS grafana-builder
 
 ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"