Ubuntu Docker Images

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

  1. Git
  2. lp:~ubuntu-docker-images/ubuntu-docker-images/+git/grafana
  3. 7.4-21.04
  4. Merge into edge
Proposed by Sergio Durigan Junior
Status: Superseded
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:7.4-21.04
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:edge
Diff against target: 43 lines (+8/-3)
1 file modified
Dockerfile (+8/-3)
Reviewer Review Type Date Requested Status
Bryce Harrington Pending
Canonical Server Pending
Review via email: mp+398403@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Unmerged commits

ca9476a... by Sergio Durigan Junior

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>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index 5ad296d..b2dba39 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -4,7 +4,7 @@
6 # and adapted to use the grafana snap built from
7 # https://github.com/auria/snap-grafana and installed from
8 # https://snapcraft.io/grafana
9-FROM ubuntu:focal AS snap-installer
10+FROM ubuntu:hirsute AS snap-installer
11
12 RUN apt-get update && \
13 DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y && \
14@@ -18,7 +18,7 @@ RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/sna
15 RUN mkdir -p /snap && unsquashfs -d /snap/grafana grafana.snap
16
17
18-FROM ubuntu:focal
19+FROM ubuntu:hirsute
20
21 EXPOSE 3000
22 LABEL maintainer="Ubuntu Server team <ubuntu-server@lists.ubuntu.com>"
23@@ -57,7 +57,8 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
24 "$GF_PATHS_DATA" && \
25 cp conf/defaults.ini "$GF_PATHS_CONFIG" && \
26 chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
27- chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
28+ chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
29+ mkdir -p /usr/share/rocks
30
31 # XXX - removed from above RUN, not in the snap yet
32 RUN if [ -f conf/ldap.toml ]; then cp conf/ldap.toml /etc/grafana/ldap.toml; fi
33@@ -66,6 +67,10 @@ COPY --from=snap-installer /snap/grafana/bin/grafana-server /snap/grafana/bin/gr
34 COPY --from=snap-installer /snap/grafana/public public
35 COPY --from=snap-installer /snap/grafana/tools tools
36
37+# Copy the manifest files from the snap
38+COPY --from=snap-installer /snap/grafana/snap/snapcraft.yaml /usr/share/rocks/
39+COPY --from=snap-installer /snap/grafana/snap/manifest.yaml /usr/share/rocks/
40+
41 COPY bin/docker-run.sh /run.sh
42
43 USER grafana

Subscribers

People subscribed via source and target branches

to all changes: