build ubuntu 22.04 image

Signed-off-by: Lokesh Mandvekar <[email protected]>
containers · May 26, 2022 · ffce2ec · ffce2ec
1 parent cd4d809
commit ffce2ec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/base_images/gce.yml b/base_images/gce.yml
@@ -23,14 +23,14 @@ 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-2110'
+    UBUNTU_BASE_FAMILY: 'ubuntu-2204-lts'
 
     # Latest Fedora release (qcow and CHECKSUM) download URLs
     # N/B: There are Fedora-Cloud...GCP.tar.gz images available, however
     #      as of this comment, they lack the cloud-init package which is
     #      required by GCP for startup resizing of the rootfs.
-    FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/development/36/Cloud/x86_64/images/Fedora-Cloud-36-x86_64-20220428.n.0-CHECKSUM"
-    FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/development/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-20220428.n.0.x86_64.qcow2"
+    FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-36-1.5-x86_64-CHECKSUM"
+    FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2"
 
     # Prior Fedora release
     PRIOR_FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-35-1.2-x86_64-CHECKSUM"

diff --git a/cache_images/podman_tooling.sh b/cache_images/podman_tooling.sh
@@ -17,9 +17,7 @@ lilto $SUDO ./hack/install_catatonit.sh
 bigto $SUDO make install.tools
 
 # shellcheck disable=SC2154
-if [[ "$OS_RELEASE_ID" == "ubuntu" ]]; then
-    lilto $SUDO make install.libseccomp.sudo
-else  # Fedora
+if [[ "$OS_RELEASE_ID" == "fedora" ]]; then
     msg "Installing swagger binary"
     download_url=$(\
         curl -s https://api.github.com/repos/go-swagger/go-swagger/releases/latest | \

diff --git a/cache_images/ubuntu_packaging.sh b/cache_images/ubuntu_packaging.sh
@@ -34,8 +34,8 @@ fi
 # end-user consumption.
 VERSION_ID=$(source /etc/os-release; echo $VERSION_ID)
 # Overview: https://build.opensuse.org/project/show/devel:kubic:libcontainers:testing
-REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/xUbuntu_$VERSION_ID/"
-GPG_URL="https://download.opensuse.org/repositories/devel:kubic:libcontainers:testing/xUbuntu_$VERSION_ID/Release.key"
+REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$VERSION_ID/"
+GPG_URL="https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/xUbuntu_$VERSION_ID/Release.key"
 
 echo "deb $REPO_URL /" | ooe.sh $SUDO \
     tee /etc/apt/sources.list.d/devel:kubic:libcontainers:testing:ci.list
@@ -51,7 +51,6 @@ INSTALL_PACKAGES=(\
     apache2-utils
     apparmor
     apt-transport-https
-    aufs-tools
     autoconf
     automake
     bash-completion
@@ -65,7 +64,6 @@ INSTALL_PACKAGES=(\
     conmon
     containernetworking-plugins
     containers-common
-    cri-o-runc
     criu
     crun
     dnsmasq
@@ -128,6 +126,7 @@ INSTALL_PACKAGES=(\
     python3-requests
     python3-setuptools
     rsync
+    runc
     scons
     skopeo
     slirp4netns

diff --git a/podman/ubuntu_release b/podman/ubuntu_release
@@ -1 +1 @@
-21.10
+22.04