Initial conversion to https://partner-images.canonical.com/oci

Author: tianon

update.sh

@@ -17,21 +17,22 @@ for v in "${versions[@]}"; do
 		continue
 	fi
 
-	thisTarBase="ubuntu-$v-core-cloudimg-$arch"
-	thisTar="$thisTarBase-root.tar.gz"
-	baseUrl="https://partner-images.canonical.com/core/$v/current"
-
-	(
-		cd "$v"
-		wget -qN "$baseUrl/"{{MD5,SHA{1,256}}SUMS{,.gpg},"$thisTarBase.manifest",'unpacked/build-info.txt'}
-		wget -N --progress=dot:giga "$baseUrl/$thisTar"
-	)
-
-	cat > "$v/Dockerfile" <<EOF
+	case "$v" in
+		bionic | focal | groovy | hirsute | trusty | xenial)
+			thisTarBase="ubuntu-$v-core-cloudimg-$arch"
+			thisTar="$thisTarBase-root.tar.gz"
+			baseUrl="https://partner-images.canonical.com/core/$v/current"
+			(
+				cd "$v"
+				wget -qN "$baseUrl/"{{MD5,SHA{1,256}}SUMS{,.gpg},"$thisTarBase.manifest",'unpacked/build-info.txt'}
+				wget -N --progress=dot:giga "$baseUrl/$thisTar"
+			)
+
+			cat > "$v/Dockerfile" <<EOF
 FROM scratch
 ADD $thisTar /
 EOF
-	cat >> "$v/Dockerfile" <<'EOF'
+			cat >> "$v/Dockerfile" <<'EOF'
 
 # a few minor docker-specific tweaks
 # see https://github.com/docker/docker/blob/9a9fc01af8fb5d98b8eec0740716226fadb3735c/contrib/mkimage/debootstrap
@@ -65,31 +66,49 @@ RUN set -xe \
 	&& echo 'Apt::AutoRemove::SuggestsImportant "false";' > /etc/apt/apt.conf.d/docker-autoremove-suggests
 EOF
 
-	if [ "$v" = 'xenial' ]; then
-		cat >> "$v/Dockerfile" <<'EOF'
+			if [ "$v" = 'xenial' ]; then
+				cat >> "$v/Dockerfile" <<'EOF'
 
 # delete all the apt list files since they're big and get stale quickly
 RUN rm -rf /var/lib/apt/lists/*
 # this forces "apt-get update" in dependent images, which is also good
 # (see also https://bugs.launchpad.net/cloud-images/+bug/1699913)
 EOF
-	else
-		cat >> "$v/Dockerfile" <<'EOF'
+			else
+				cat >> "$v/Dockerfile" <<'EOF'
 
 # verify that the APT lists files do not exist
 RUN [ -z "$(apt-get indextargets)" ]
 # (see https://bugs.launchpad.net/cloud-images/+bug/1699913)
 EOF
-	fi
+			fi
 
-	cat >> "$v/Dockerfile" <<'EOF'
+			cat >> "$v/Dockerfile" <<'EOF'
 
 # make systemd-detect-virt return "docker"
 # See: https://github.com/systemd/systemd/blob/aa0c34279ee40bce2f9681b496922dedbadfca19/src/basic/virt.c#L434
 RUN mkdir -p /run/systemd && echo 'docker' > /run/systemd/container
 
 CMD ["/bin/bash"]
 EOF
+			;;
+
+		*)
+			thisTarBase="ubuntu-$v-oci-$arch"
+			thisTar="$thisTarBase-root.tar.gz"
+			baseUrl="https://partner-images.canonical.com/oci/$v/current"
+			(
+				cd "$v"
+				wget -qN "$baseUrl/"{SHA256SUMS{,.gpg},"$thisTarBase.manifest",'unpacked/build-info.txt'}
+				wget -N --progress=dot:giga "$baseUrl/$thisTar"
+			)
+			cat > "$v/Dockerfile" <<-EOF
+				FROM scratch
+				ADD $thisTar /
+				CMD ["bash"]
+			EOF
+			;;
+	esac
 
 	toVerify+=( "$v" )
 done

verify.sh

@@ -26,21 +26,31 @@ arch="$(cat arch 2>/dev/null || true)"
 : ${arch:=$hostArch}
 
 for v in "${versions[@]}"; do
-	thisTarBase="ubuntu-$v-core-cloudimg-$arch"
-	thisTar="$thisTarBase-root.tar.gz"
-	baseUrl="https://partner-images.canonical.com/core/$v"
-	for sums in sha256 sha1 md5; do
+	case "$v" in
+		bionic | focal | groovy | hirsute | trusty | xenial)
+			thisTarBase="ubuntu-$v-core-cloudimg-$arch"
+			thisTar="$thisTarBase-root.tar.gz"
+			sumTypes=( sha256 sha1 md5 )
+			;;
+
+		*)
+			thisTarBase="ubuntu-$v-oci-$arch"
+			thisTar="$thisTarBase-root.tar.gz"
+			sumTypes=( sha256 )
+			;;
+	esac
+	for sums in "${sumTypes[@]}"; do
 		sumsFile="$v/${sums^^}SUMS" # "SHA256SUMS"
 		sumCmd="${sums}sum" # "sha256sum"
-		if [ "$gpgFingerprint" ]; then
+		if [ -n "$gpgFingerprint" ]; then
 			if [ ! -f "$sumsFile.gpg" ]; then
 				echo >&2 "warning: '$sumsFile.gpg' appears to be missing!"
 				badness=1
 			else
 				( set -x; gpg --batch --verify "$sumsFile.gpg" "$sumsFile" )
 			fi
 		fi
-		if [ -f "$sumsFile" ]; then
+		if [ -s "$sumsFile" ]; then
 			grep " *$thisTar\$" "$sumsFile" | ( set -x; cd "$v" && "$sumCmd" -c - )
 		else
 			echo >&2 "warning: missing '$sumsFile'!"