Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/cassandra:4.0-20.04-wip into ~ubuntu-docker-images/ubuntu-docker-images/+git/cassandra:main

[Athos Ribeiro]

New 20.04 branch. Note that this is targeting main for comparison purposes only. This will be pushed to a new 4.0-20.04 branch from where the OCI will be built.

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos.

I looked at the MP and the modifications LGTM.

I am approving it, but we shouldn't publish anything until we have at least the unit tests ready for the image. It is really helpful when we can perform the tests after building the image locally and make sure that everything is working.

Thanks again.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Sergio!

I will finish working on the integration tests before we start publishing these images :)

diff --git a/Dockerfile b/Dockerfile
index ef4d6da..7d28709 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,10 +7,10 @@ RUN set -eux; \
 	apt-get update && \
 	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y && \
 	DEBIAN_FRONTEND=noninteractive apt-get install -y \
-		curl ca-certificates squashfs-tools && \
+		jq curl ca-certificates squashfs-tools && \
 	# taken from https://snapcraft.io/docs/build-on-docker
 	# Alternatively, we can install snapd, and issue `snap download cassandra`
-	curl -L 'https://launchpad.net/~athos-ribeiro/+snap/cassandra-test/+build/1437307/+files/cassandra_4.0-rc1_amd64.snap' --output cassandra.snap && \
+	curl -L $(curl -H 'X-Ubuntu-Series: 16' -H "X-Ubuntu-Architecture: $(dpkg --print-architecture)" 'https://api.snapcraft.io/api/v1/snaps/details/cassandra?channel=20.04/edge' | jq '.download_url' -r) --output cassandra.snap && \
 	mkdir -p /snap && unsquashfs -d /snap/cassandra cassandra.snap