Merge ~rbarry/ubuntu-docker-images/+git/grafana:8.2-22.04 into ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:8.2-22.04

[Ryan Barry]

Use rock/beta to (re)build the Grafana 8.2 image

Unmerged commits

4961335... by Ryan Barry on 2022-08-10

Build from rock/beta instead

diff --git a/Dockerfile b/Dockerfile
index f6ab5b6..a36072d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,14 +7,14 @@
 FROM ubuntu:jammy AS snap-installer
 
 RUN set -eux; \
-	apt-get update; \
-	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-		jq curl ca-certificates squashfs-tools
+  apt-get update; \
+  DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+  jq curl ca-certificates squashfs-tools
 
 # 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=rock/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/beta' | jq '.download_url' -r) --output grafana.snap
 
 RUN mkdir -p /snap && unsquashfs -d /snap/grafana grafana.snap
 
@@ -27,12 +27,12 @@ ARG GF_UID="472"
 ARG GF_GID="472"
 
 ENV PATH="/usr/share/grafana/bin:$PATH" \
-	GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-	GF_PATHS_DATA="/var/lib/grafana" \
-	GF_PATHS_HOME="/usr/share/grafana" \
-	GF_PATHS_LOGS="/var/log/grafana" \
-	GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-	GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
+  GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
+  GF_PATHS_DATA="/var/lib/grafana" \
+  GF_PATHS_HOME="/usr/share/grafana" \
+  GF_PATHS_LOGS="/var/log/grafana" \
+  GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
+  GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
 
 WORKDIR $GF_PATHS_HOME
 
@@ -42,29 +42,29 @@ ENV TZ UTC
 
 # curl should be part of the image
 RUN set -eux; \
-	apt-get update; \
-	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-		ca-certificates curl tzdata; \
-	DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \
-	rm -rf /var/lib/apt/lists/*; \
-	mkdir -p "$GF_PATHS_HOME/.aws"; \
-	addgroup --system --gid $GF_GID grafana; \
-	adduser --uid $GF_UID --system --ingroup grafana grafana; \
-	mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-		"$GF_PATHS_PROVISIONING/dashboards" \
-		"$GF_PATHS_PROVISIONING/notifiers" \
-		"$GF_PATHS_PROVISIONING/plugins" \
-		"$GF_PATHS_LOGS" \
-		"$GF_PATHS_PLUGINS" \
-		"$GF_PATHS_DATA"; \
-	cp conf/defaults.ini "$GF_PATHS_CONFIG"; \
-	cp conf/ldap.toml /etc/grafana/ldap.toml; \
-	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"; \
-	mkdir -p /usr/share/rocks; \
-# create deb manifest
-	(echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query
+  apt-get update; \
+  DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+  ca-certificates curl tzdata; \
+  DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \
+  rm -rf /var/lib/apt/lists/*; \
+  mkdir -p "$GF_PATHS_HOME/.aws"; \
+  addgroup --system --gid $GF_GID grafana; \
+  adduser --uid $GF_UID --system --ingroup grafana grafana; \
+  mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
+  "$GF_PATHS_PROVISIONING/dashboards" \
+  "$GF_PATHS_PROVISIONING/notifiers" \
+  "$GF_PATHS_PROVISIONING/plugins" \
+  "$GF_PATHS_LOGS" \
+  "$GF_PATHS_PLUGINS" \
+  "$GF_PATHS_DATA"; \
+  cp conf/defaults.ini "$GF_PATHS_CONFIG"; \
+  cp conf/ldap.toml /etc/grafana/ldap.toml; \
+  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"; \
+  mkdir -p /usr/share/rocks; \
+  # create deb manifest
+  (echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query
 
 COPY --from=snap-installer /snap/grafana/bin/grafana-server /snap/grafana/bin/grafana-cli bin/
 COPY --from=snap-installer /snap/grafana/public public