From 1c9ca495c8c5d8ad7a60629a68de01ee670ea70b Mon Sep 17 00:00:00 2001
From: Rui Lopes <rgl@ruilopes.com>
Date: Sun, 28 Feb 2021 12:40:59 +0000
Subject: [PATCH] upgrade to ubuntu 20.04

---
 README.md                                                  | 4 ++--
 Vagrantfile                                                | 2 +-
 hello-world-debian-package/hello-world/debian/changelog    | 2 +-
 provision/provision-docker.sh                              | 2 +-
 provision/provision-dotnet-core-sdk.sh                     | 2 +-
 provision/provision-nexus/src/main/groovy/provision.groovy | 2 +-
 provision/use-apt-repository.sh                            | 6 ++++--
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 51f7d57..3c53f03 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,9 @@ This will:
 
 # Usage
 
-Build and install the [Ubuntu Base Box](https://github.com/rgl/ubuntu-vagrant).
+Build and install the [Ubuntu 20.04 Base Box](https://github.com/rgl/ubuntu-vagrant).
 
-Build and install the [Windows Base Box](https://github.com/rgl/windows-2016-vagrant).
+Build and install the [Windows 2019 Base Box](https://github.com/rgl/windows-vagrant).
 
 Add the following entry to your `/etc/hosts` file:
 
diff --git a/Vagrantfile b/Vagrantfile
index 727720d..55b6178 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -21,7 +21,7 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.define :nexus do |config|
-    config.vm.box = 'ubuntu-18.04-amd64'
+    config.vm.box = 'ubuntu-20.04-amd64'
     config.vm.hostname = nexus_domain
     config.vm.network 'private_network', ip: nexus_ip
     config.vm.provider :libvirt do |lv, config|
diff --git a/hello-world-debian-package/hello-world/debian/changelog b/hello-world-debian-package/hello-world/debian/changelog
index 50da73b..c2b69d7 100644
--- a/hello-world-debian-package/hello-world/debian/changelog
+++ b/hello-world-debian-package/hello-world/debian/changelog
@@ -1,4 +1,4 @@
-hello-world (1.0.0) bionic; urgency=low
+hello-world (1.0.0) focal; urgency=low
 
   * Hello World.
 
diff --git a/provision/provision-docker.sh b/provision/provision-docker.sh
index 89a51c5..c9aafa5 100644
--- a/provision/provision-docker.sh
+++ b/provision/provision-docker.sh
@@ -2,7 +2,7 @@
 set -eux
 
 # NB execute apt-cache madison docker-ce to known the available versions.
-docker_version="${1:-5:19.03.8~3-0~ubuntu-bionic}"; shift || true
+docker_version="${1:-5:20.10.4~3-0~ubuntu-focal}"; shift || true
 registry_proxy_domain="${1:-$(hostname --fqdn)}"; shift || true
 # NB as-of docker 19.03.8, there is still no way to specify a registry mirror credentials,
 #    as such, we cannot use our docker-group registry, instead we must use the docker-proxy
diff --git a/provision/provision-dotnet-core-sdk.sh b/provision/provision-dotnet-core-sdk.sh
index 465c664..fc5fc6c 100644
--- a/provision/provision-dotnet-core-sdk.sh
+++ b/provision/provision-dotnet-core-sdk.sh
@@ -6,7 +6,7 @@ echo 'export DOTNET_CLI_TELEMETRY_OPTOUT=1' >/etc/profile.d/opt-out-dotnet-cli-t
 source /etc/profile.d/opt-out-dotnet-cli-telemetry.sh
 
 # install the dotnet core sdk.
-# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-1804
+# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu
 wget -qO packages-microsoft-prod.deb "https://packages.microsoft.com/config/ubuntu/$(lsb_release -s -r)/packages-microsoft-prod.deb"
 dpkg -i packages-microsoft-prod.deb
 apt-get install -y apt-transport-https
diff --git a/provision/provision-nexus/src/main/groovy/provision.groovy b/provision/provision-nexus/src/main/groovy/provision.groovy
index d838aa5..4cc76a1 100644
--- a/provision/provision-nexus/src/main/groovy/provision.groovy
+++ b/provision/provision-nexus/src/main/groovy/provision.groovy
@@ -36,7 +36,7 @@ repository.createRawHosted("adhoc-package", "default", false, WritePolicy.ALLOW_
 // create a apt repository backed by the default blob store.
 // see https://help.sonatype.com/repomanager3/formats/apt-repositories
 pgpPrivateKey = new File('/vagrant/shared/apt-hosted-private.key').getText('UTF-8')
-repository.createAptHosted("apt-hosted", "bionic", pgpPrivateKey, "abracadabra", "default", WritePolicy.ALLOW_ONCE, true)
+repository.createAptHosted("apt-hosted", "focal", pgpPrivateKey, "abracadabra", "default", WritePolicy.ALLOW_ONCE, true)
 
 
 // create a npm repository backed by the default blob store.
diff --git a/provision/use-apt-repository.sh b/provision/use-apt-repository.sh
index de6b592..5e49ce3 100644
--- a/provision/use-apt-repository.sh
+++ b/provision/use-apt-repository.sh
@@ -3,7 +3,9 @@ set -eux
 
 nexus_domain=$(hostname --fqdn)
 
-cd /vagrant/hello-world-debian-package
+rm -rf tmp/hello-world-debian-package
+cp -r /vagrant/hello-world-debian-package tmp
+cd tmp/hello-world-debian-package
 
 #
 # test the apt repository.
@@ -30,7 +32,7 @@ curl \
 apt-key add /vagrant/shared/apt-hosted-public.key
 
 # install the hello-world package.
-echo "deb [arch=amd64] https://$nexus_domain/repository/apt-hosted bionic main" >/etc/apt/sources.list.d/nexus-apt-hosted.list
+echo "deb [arch=amd64] https://$nexus_domain/repository/apt-hosted focal main" >/etc/apt/sources.list.d/nexus-apt-hosted.list
 apt-get update
 apt-get install -y hello-world
 apt-cache show hello-world