From 94560a21ea15408f8a72f3dce75f95858c65debf Mon Sep 17 00:00:00 2001
From: Russ <russ@rw.id.au>
Date: Wed, 7 Oct 2020 09:24:00 +1100
Subject: [PATCH] docker: update Dockerfiles to use focal images (#388)

* Update Dockerfiles to use Ubuntu Focal
* runtime=nvidia is deprecated, gpus=all has replaced it in newer versions of docker

Signed-off-by: Russ Webber <russ@rw.id.au>
---
 docker/Dockerfile.base     | 2 +-
 docker/Dockerfile.ignition | 4 ++--
 docker/README.md           | 2 +-
 docker/run.bash            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index e67af81012..e84976b01d 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 RUN apt-get update \
  && apt-get install -y \
diff --git a/docker/Dockerfile.ignition b/docker/Dockerfile.ignition
index 9c5fed4afe..0e8fabb37d 100644
--- a/docker/Dockerfile.ignition
+++ b/docker/Dockerfile.ignition
@@ -3,8 +3,8 @@
 #   This docker file is used by build.bash and run.bash to build and run
 #   an Ignition distribution based on binaries. See the README.md file.
 
-# Ubuntu 18.04 with nvidia-docker2 beta opengl support
-FROM nvidia/opengl:1.0-glvnd-devel-ubuntu18.04
+# Ubuntu 20.04 with nvidia opengl support
+FROM nvidia/opengl:1.2-glvnd-devel-ubuntu20.04
 
 # Name of the Ignition distribution
 ARG ign_distribution
diff --git a/docker/README.md b/docker/README.md
index f70c5b33b6..7f91e6e88b 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -154,7 +154,7 @@ Docker has two available versions: Community Edition (CE) and Enterprise Edition
 
 1. Verify the installation:
 
-        docker run --runtime=nvidia --rm nvidia/cuda nvidia-smi
+        docker run --gpus all --rm nvidia/cuda nvidia-smi
 
     This command should print your GPU information, for example:
 
diff --git a/docker/run.bash b/docker/run.bash
index ce6e3af838..73741084dd 100755
--- a/docker/run.bash
+++ b/docker/run.bash
@@ -40,7 +40,7 @@ docker run -it \
   -v "/etc/localtime:/etc/localtime:ro" \
   -v "/dev/input:/dev/input" \
   --rm \
-  --runtime=nvidia \
+  --gpus all \
   --security-opt seccomp=unconfined \
   $IMG \
   ${@:2}