Ubuntu Docker Images

Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:use-21.04-snap-track into ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:7.4-21.04

  1. Git
  2. lp:~ubuntu-docker-images/ubuntu-docker-images/+git/grafana
  3. use-21.04-snap-track
  4. Merge into 7.4-21.04
Proposed by Sergio Durigan Junior
Status: Merged
Merged at revision: 8ecb1faafdd84a83f3326110c7c3f40f9f2d5700
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:use-21.04-snap-track
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:7.4-21.04
Diff against target: 12 lines (+1/-1)
1 file modified
Dockerfile (+1/-1)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  Approve
Bryce Harrington Pending
Review via email: mp+399989@code.launchpad.net

Description of the change

Now that we have the 21.04 track for the grafana snap, we should use it to build the OCI image.

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

As with the 20.04 branch this is correct and now allows to properly split the builds based on the tracks.
+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index b2dba39..ba826ca 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -13,7 +13,7 @@ RUN apt-get update && \
6
7 # taken from https://snapcraft.io/docs/build-on-docker
8 # Alternatively, we can install snapd, and issue `snap download grafana`
9-RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/grafana?channel=edge' | jq '.download_url' -r) --output grafana.snap
10+RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/grafana?channel=21.04/edge' | jq '.download_url' -r) --output grafana.snap
11
12 RUN mkdir -p /snap && unsquashfs -d /snap/grafana grafana.snap
13

Subscribers

People subscribed via source and target branches

to all changes: