From c8e998c80924beb1818b8359874f68cdfef805ae Mon Sep 17 00:00:00 2001
From: "Noah D. Brenowitz" <nbren12@gmail.com>
Date: Tue, 9 Mar 2021 09:19:46 -0800
Subject: [PATCH] Upgrade image to ubuntu 20.04

---
 Makefile          | 2 +-
 docker/Dockerfile | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 550a5aafb..d21fc9e2c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ OTHER_MOUNTS ?=
 
 # base images w/ or w/o CUDA
 ifeq ($(CUDA),n)
-	BASE_IMAGE ?=ubuntu:18.04
+	BASE_IMAGE ?=ubuntu:20.04
 	DEP_TAG_NAME ?=gnu7-mpich314-nocuda
 else
 	BASE_IMAGE ?=nvidia/cuda:10.2-devel-ubuntu18.04
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 91a49a1fc..e598ba1e8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,7 +25,9 @@ FROM $MPI_IMAGE AS mpi_image
 
 FROM $BASE_IMAGE AS fv3gfs-environment
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata && \
+    apt-get install -y \
     wget \
     gcc \
     libtool-bin \
@@ -59,9 +61,6 @@ RUN git config --global http.sslverify false && \
 ## Setup environment for Serialbox
 ##---------------------------------------------------------------------------------
 FROM fv3gfs-environment as fv3gfs-environment-serialbox
-# set TZ
-ENV DEBIAN_FRONTEND=noninteractive TZ=US/Pacific
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # install dependencies for serialbox
 RUN apt-get update && apt-get install -y \