Merge ~sergiodj/ubuntu-docker-images/+git/grafana:8.2-22.04 into ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:8.1-21.10

[Sergio Durigan Junior]

This MP creates the grafana 22.04 ROCK image.

It is targeted against the 8.1-21.10 branch only to make it easier to review; once this is approved, I will push it to a new branch named 8.2-22.04.

The only significant change here is that we're going to start using the 'rock' track when downloading the snap; otherwise, everything stays the same.

As a reminder: we're not updating this image to the latest upstream version because it can't build on big endian architectures (see https://github.com/grafana/grafana/issues/46269).

Tested locally with the unittest:

DOCKER_IMAGE=sergiodj/grafana /bin/sh ~/work/server-test-scripts/oci-unit-tests/grafana_test.sh
Error response from daemon: manifest for sergiodj/grafana:latest not found: manifest unknown: manifest unknown
test_default_config
test_default_config_ipv6
test_persistent_storage
test_manifest_exists

Ran 4 tests.

OK

[Bryce Harrington (bryce)]

Pretty much carbon copy of changes to prometheus, and again LGTM.

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Wednesday, March 16 2022, Bryce Harrington wrote:

> Pretty much carbon copy of changes to prometheus, and again LGTM.

Thanks for the review, Bryce.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/Dockerfile b/Dockerfile
index aae5c65..f6ab5b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 # and adapted to use the grafana snap built from
 # https://github.com/auria/snap-grafana and installed from
 # https://snapcraft.io/grafana
-FROM ubuntu:impish AS snap-installer
+FROM ubuntu:jammy AS snap-installer
 
 RUN set -eux; \
 	apt-get update; \
@@ -14,11 +14,11 @@ RUN set -eux; \
 
 # taken from https://snapcraft.io/docs/build-on-docker
 # Alternatively, we can install snapd, and issue `snap download grafana`
-RUN curl -L -H 'Snap-CDN: none' $(curl -H 'X-Ubuntu-Series: 16'  -H "X-Ubuntu-Architecture: $(dpkg --print-architecture)" 'https://api.snapcraft.io/api/v1/snaps/details/grafana?channel=21.10/edge' | jq '.download_url' -r) --output grafana.snap
+RUN curl -L -H 'Snap-CDN: none' $(curl -H 'X-Ubuntu-Series: 16'  -H "X-Ubuntu-Architecture: $(dpkg --print-architecture)" 'https://api.snapcraft.io/api/v1/snaps/details/grafana?channel=rock/edge' | jq '.download_url' -r) --output grafana.snap
 
 RUN mkdir -p /snap && unsquashfs -d /snap/grafana grafana.snap
 
-FROM ubuntu:impish
+FROM ubuntu:jammy
 
 EXPOSE 3000
 LABEL maintainer="Ubuntu Server team <[e-mail]>"