~sergiodj/ubuntu-docker-images/+git/grafana:8.1-21.10

Branch merges

Propose for merging

Merged into ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:7.4-21.04 at revision 1a1e4ffaf026f16c9e1a57b62fd92e9b2cb96d45

Athos Ribeiro: Approve on 2021-08-26

Bryce Harrington: Pending requested 2021-08-25

Canonical Server: Pending requested 2021-08-25

Diff: 170 lines (+43/-42)

4 files modified

Dockerfile (+36/-35)
HACKING.md (+2/-2)
README.md (+3/-3)
data/grafana.yaml (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

1a1e4ff... by Sergio Durigan Junior on 2021-08-25

Update documentation

Reflect the bump to 21.10 and the new grafana version.

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

9fe8199... by Sergio Durigan Junior on 2021-08-25

Adjust Dockerfile for 21.10 + some cleanups

First of all, this commit contains the necessary adjustments in order
to deliver a 21.10 grafana OCI image.

Secondly, I took this opportunity to bring this Dockerfile up to the
standards used for our other Dockerfiles. A non-exhaustive list of
improvements:

- Consistently using TABs for indentation.

- Join the RUN statements (from the second image).

- Get rid of the "XXX" comment and join the "cp" command into the
  existing RUN statement.

This has been built & tested (using our unittest).

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

3902b0d... by Sergio Durigan Junior on 2021-06-09

Download arch-specific snap

When building the OCI image on non-amd64 architectures, we're not
downloading the proper snap for that arch. We need to specify the
architecture as one of the headers of the API request.

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

8ecb1fa... by Sergio Durigan Junior on 2021-03-22

Update Dockerfile to use the 21.04 snap track when building grafana.

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

6028bc9... by Sergio Durigan Junior on 2021-03-02

Update README.md

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

444a674... 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. This also updates the
data/grafana.yaml file, needed for the README templates.

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

6a0fb6f... by Sergio Durigan Junior on 2021-02-08

Dockerfile: Create manifest files to track security updates (LP: #1905052)

We're building grafana directly from the snap, so we can reuse the
manifest files from there according to what's described in
https://bugs.launchpad.net/ubuntu-docker-images/+bug/1905052.

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

ca603bc... by Sergio Durigan Junior on 2020-11-25

Implement templating (LP: #1905286)

This commit implements templating support for the image. It:

- Moves the data from the templates.git repository here.

- Implements a Makefile that can be used to automatically generate the
  documentation (README.md, HACKING.md).

- Regenerates everything using the templates.

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

e573a6c... by Sergio Durigan Junior on 2020-11-23

s/squeakywheel/ubuntu/g

We're releasing the images under the 'ubuntu' namespace.

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

90fb422... by Sergio Durigan Junior on 2020-11-19

Update project URL

We've moved from https://launchpad.net/ubuntu-server-oci to
https://launchpad.net/ubuntu-docker-images, so we need to update all
READMEs accordingly.

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