Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:7.4-21.04 into ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:edge

[Sergio Durigan Junior]

This updates grafana to 7.4.1 and the base image to hirsute.

Tested with our unit tests. I've also set up a docker container with the image and made sure that I could access the site and view everything there.

Unmerged commits

ca9476a... by Sergio Durigan Junior on 2021-02-19

Update Dockerfile to use hirsute, and grafana to 7.4.1

The grafana snap has been recently updated to 7.4.1, and we are now
using hirsute as the base for the images.

Signed-off-by: Sergio Durigan Junior <email address hidden>

diff --git a/Dockerfile b/Dockerfile
index 5ad296d..b2dba39 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:focal AS snap-installer
+FROM ubuntu:hirsute AS snap-installer
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y && \
@@ -18,7 +18,7 @@ RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/sna
 RUN mkdir -p /snap && unsquashfs -d /snap/grafana grafana.snap
 
 
-FROM ubuntu:focal
+FROM ubuntu:hirsute
 
 EXPOSE 3000
 LABEL maintainer="Ubuntu Server team <[e-mail]>"
@@ -57,7 +57,8 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
              "$GF_PATHS_DATA" && \
     cp conf/defaults.ini "$GF_PATHS_CONFIG" && \
     chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
+    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
+    mkdir -p /usr/share/rocks
 
 # XXX - removed from above RUN, not in the snap yet
 RUN if [ -f conf/ldap.toml ]; then cp conf/ldap.toml /etc/grafana/ldap.toml; fi
@@ -66,6 +67,10 @@ COPY --from=snap-installer /snap/grafana/bin/grafana-server /snap/grafana/bin/gr
 COPY --from=snap-installer /snap/grafana/public public
 COPY --from=snap-installer /snap/grafana/tools tools
 
+# Copy the manifest files from the snap
+COPY --from=snap-installer /snap/grafana/snap/snapcraft.yaml /usr/share/rocks/
+COPY --from=snap-installer /snap/grafana/snap/manifest.yaml /usr/share/rocks/
+
 COPY bin/docker-run.sh /run.sh
 
 USER grafana