Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build ubuntu 22.04 image #134

Merged
merged 1 commit into from
Jun 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions base_images/gce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions base_images/ubuntu_base-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ PKGS=( \
git
openssh-client
openssh-server
rng-tools5
software-properties-common
)

Expand All @@ -47,6 +48,7 @@ install_automation_tooling

if ! ((CONTAINER)); then
custom_cloud_init
$SUDO systemctl enable rngd
fi

finalize
4 changes: 1 addition & 3 deletions cache_images/podman_tooling.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 | \
Expand Down
13 changes: 6 additions & 7 deletions cache_images/ubuntu_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ fi
# automated testing. These packages are not otherwise intended for
# 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"
# Overview: https://build.opensuse.org/project/show/devel:kubic:libcontainers:unstable
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
tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable:ci.list
curl --fail --silent --location --url "$GPG_URL" | \
gpg --dearmor | \
$SUDO tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_testing_ci.gpg &> /dev/null
$SUDO tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable_ci.gpg &> /dev/null


# Removed golang-1.14 from install packages due to known
Expand All @@ -51,7 +51,6 @@ INSTALL_PACKAGES=(\
apache2-utils
apparmor
apt-transport-https
aufs-tools
autoconf
automake
bash-completion
Expand All @@ -65,7 +64,6 @@ INSTALL_PACKAGES=(\
conmon
containernetworking-plugins
containers-common
cri-o-runc
criu
crun
dnsmasq
Expand Down Expand Up @@ -128,6 +126,7 @@ INSTALL_PACKAGES=(\
python3-requests
python3-setuptools
rsync
runc
scons
skopeo
slirp4netns
Expand Down
2 changes: 1 addition & 1 deletion podman/ubuntu_release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21.10
22.04