From 3322b831839354fd9748fa0074d93960bf4bf450 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Thu, 17 Dec 2020 13:50:21 -0700
Subject: [PATCH] net/gce.sh: Upgrade to Ubuntu 20.04

---
 net/scripts/gce-provider.sh    | 6 +++---
 net/scripts/install-certbot.sh | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net/scripts/gce-provider.sh b/net/scripts/gce-provider.sh
index 8b18be6e1..9f76cf020 100755
--- a/net/scripts/gce-provider.sh
+++ b/net/scripts/gce-provider.sh
@@ -174,10 +174,10 @@ cloud_CreateInstances() {
     # the stock Ubuntu 18.04 image and programmatically install CUDA after the
     # instance boots
     #
-    imageName="ubuntu-1804-bionic-v20181029-with-cuda-10-and-cuda-9-2 --image-project principal-lane-200702"
+    imageName="ubuntu-2004-focal-v20201211-with-cuda-10-2 --image-project principal-lane-200702"
   else
-    # Upstream Ubuntu 18.04 LTS image
-    imageName="ubuntu-1804-bionic-v20190813a --image-project ubuntu-os-cloud"
+    # Upstream Ubuntu 20.04 LTS image
+    imageName="ubuntu-2004-focal-v20201201 --image-project ubuntu-os-cloud"
   fi
 
   declare -a nodes
diff --git a/net/scripts/install-certbot.sh b/net/scripts/install-certbot.sh
index 81f89d82f..c0524f647 100755
--- a/net/scripts/install-certbot.sh
+++ b/net/scripts/install-certbot.sh
@@ -4,9 +4,11 @@ set -ex
 [[ $(uname) = Linux ]] || exit 1
 [[ $USER = root ]] || exit 1
 
-apt-get update
-add-apt-repository --yes ppa:certbot/certbot
-apt-get --assume-yes install certbot
+snap install core
+snap refresh core
+
+snap install --classic certbot
+ln -sf /snap/bin/certbot /usr/bin/certbot
 
 cat > /certbot-restore.sh <<'EOF'
 #!/usr/bin/env bash