Skip to content

Commit c8e998c

Browse files
committed
Upgrade image to ubuntu 20.04
1 parent fe24ba8 commit c8e998c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OTHER_MOUNTS ?=
1313

1414
# base images w/ or w/o CUDA
1515
ifeq ($(CUDA),n)
16-
BASE_IMAGE ?=ubuntu:18.04
16+
BASE_IMAGE ?=ubuntu:20.04
1717
DEP_TAG_NAME ?=gnu7-mpich314-nocuda
1818
else
1919
BASE_IMAGE ?=nvidia/cuda:10.2-devel-ubuntu18.04

docker/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ FROM $MPI_IMAGE AS mpi_image
2525

2626
FROM $BASE_IMAGE AS fv3gfs-environment
2727

28-
RUN apt-get update && apt-get install -y \
28+
RUN apt-get update && \
29+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata && \
30+
apt-get install -y \
2931
wget \
3032
gcc \
3133
libtool-bin \
@@ -59,9 +61,6 @@ RUN git config --global http.sslverify false && \
5961
## Setup environment for Serialbox
6062
##---------------------------------------------------------------------------------
6163
FROM fv3gfs-environment as fv3gfs-environment-serialbox
62-
# set TZ
63-
ENV DEBIAN_FRONTEND=noninteractive TZ=US/Pacific
64-
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
6564

6665
# install dependencies for serialbox
6766
RUN apt-get update && apt-get install -y \

0 commit comments

Comments
 (0)