From 63f2c44c7738cc4c3ff2ee72e229c51330b5cef2 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 19 Oct 2021 10:54:25 -0400 Subject: [PATCH] Update Ubuntu Images to 21.10 This replaces Ubuntu 21.04 with 21.10 Also, bump the version of golang up to match the native packaged version. But still use the upstream source, assuming it's needed to address the previously discovered performance issues. Signed-off-by: Chris Evich --- base_images/gce.yml | 2 +- cache_images/ubuntu_packaging.sh | 3 ++- podman/ubuntu_release | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/base_images/gce.yml b/base_images/gce.yml index b6b9fa90..ea408386 100644 --- a/base_images/gce.yml +++ b/base_images/gce.yml @@ -23,7 +23,7 @@ variables: # Empty value means it must be passed in on command-line # Upstream source for Ubuntu image to duplicate (prevents expiration). # Use the most recent image based on this family name. - UBUNTU_BASE_FAMILY: 'ubuntu-2104' + UBUNTU_BASE_FAMILY: 'ubuntu-2110' # Latest Fedora release download URL FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-Base-34-1.2.x86_64.qcow2" diff --git a/cache_images/ubuntu_packaging.sh b/cache_images/ubuntu_packaging.sh index 60b88818..9a57fc3a 100644 --- a/cache_images/ubuntu_packaging.sh +++ b/cache_images/ubuntu_packaging.sh @@ -187,7 +187,8 @@ echo "Configuring Go environment" # a symlink is the appropriate way to "install" a specific version system-wide. # # Add upstream golang for perf issues -curl -s -L https://golang.org/dl/go1.15.11.linux-amd64.tar.gz | $SUDO tar xzf - -C /usr/local/ +curl -s -L https://golang.org/dl/go1.17.3.linux-amd64.tar.gz | \ + $SUDO tar xzf - -C /usr/local/ # Now linking to upstream golang until ubuntu performance issues are resolved $SUDO ln -sf /usr/local/go/bin/* /usr/bin/ diff --git a/podman/ubuntu_release b/podman/ubuntu_release index 716d3f31..c83d3eb5 100644 --- a/podman/ubuntu_release +++ b/podman/ubuntu_release @@ -1 +1 @@ -21.04 +21.10