Ubuntu Docker Images

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

  1. Git
  2. lp:~rbarry/ubuntu-docker-images/+git/grafana
  3. 8.2-22.04
  4. Merge into 8.2-22.04
Proposed by Ryan Barry
Status: Needs review
Proposed branch: ~rbarry/ubuntu-docker-images/+git/grafana:8.2-22.04
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:8.2-22.04
Diff against target: 96 lines (+34/-34)
1 file modified
Dockerfile (+34/-34)
Reviewer Review Type Date Requested Status
Canonical Server Pending
Review via email: mp+428180@code.launchpad.net

Commit message

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

To post a comment you must log in.

Unmerged commits

4961335... by Ryan Barry

Build from rock/beta instead

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Dockerfile b/Dockerfile
index f6ab5b6..a36072d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,14 +7,14 @@
7FROM ubuntu:jammy AS snap-installer7FROM ubuntu:jammy AS snap-installer
88
9RUN set -eux; \9RUN set -eux; \
10 apt-get update; \10 apt-get update; \
11 DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \11 DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
12 DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \12 DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
13 jq curl ca-certificates squashfs-tools13 jq curl ca-certificates squashfs-tools
1414
15# taken from https://snapcraft.io/docs/build-on-docker15# taken from https://snapcraft.io/docs/build-on-docker
16# Alternatively, we can install snapd, and issue `snap download grafana`16# Alternatively, we can install snapd, and issue `snap download grafana`
17RUN 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.snap17RUN 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
1818
19RUN mkdir -p /snap && unsquashfs -d /snap/grafana grafana.snap19RUN mkdir -p /snap && unsquashfs -d /snap/grafana grafana.snap
2020
@@ -27,12 +27,12 @@ ARG GF_UID="472"
27ARG GF_GID="472"27ARG GF_GID="472"
2828
29ENV PATH="/usr/share/grafana/bin:$PATH" \29ENV PATH="/usr/share/grafana/bin:$PATH" \
30 GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \30 GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
31 GF_PATHS_DATA="/var/lib/grafana" \31 GF_PATHS_DATA="/var/lib/grafana" \
32 GF_PATHS_HOME="/usr/share/grafana" \32 GF_PATHS_HOME="/usr/share/grafana" \
33 GF_PATHS_LOGS="/var/log/grafana" \33 GF_PATHS_LOGS="/var/log/grafana" \
34 GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \34 GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
35 GF_PATHS_PROVISIONING="/etc/grafana/provisioning"35 GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
3636
37WORKDIR $GF_PATHS_HOME37WORKDIR $GF_PATHS_HOME
3838
@@ -42,29 +42,29 @@ ENV TZ UTC
4242
43# curl should be part of the image43# curl should be part of the image
44RUN set -eux; \44RUN set -eux; \
45 apt-get update; \45 apt-get update; \
46 DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \46 DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
47 DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \47 DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
48 ca-certificates curl tzdata; \48 ca-certificates curl tzdata; \
49 DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \49 DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \
50 rm -rf /var/lib/apt/lists/*; \50 rm -rf /var/lib/apt/lists/*; \
51 mkdir -p "$GF_PATHS_HOME/.aws"; \51 mkdir -p "$GF_PATHS_HOME/.aws"; \
52 addgroup --system --gid $GF_GID grafana; \52 addgroup --system --gid $GF_GID grafana; \
53 adduser --uid $GF_UID --system --ingroup grafana grafana; \53 adduser --uid $GF_UID --system --ingroup grafana grafana; \
54 mkdir -p "$GF_PATHS_PROVISIONING/datasources" \54 mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
55 "$GF_PATHS_PROVISIONING/dashboards" \55 "$GF_PATHS_PROVISIONING/dashboards" \
56 "$GF_PATHS_PROVISIONING/notifiers" \56 "$GF_PATHS_PROVISIONING/notifiers" \
57 "$GF_PATHS_PROVISIONING/plugins" \57 "$GF_PATHS_PROVISIONING/plugins" \
58 "$GF_PATHS_LOGS" \58 "$GF_PATHS_LOGS" \
59 "$GF_PATHS_PLUGINS" \59 "$GF_PATHS_PLUGINS" \
60 "$GF_PATHS_DATA"; \60 "$GF_PATHS_DATA"; \
61 cp conf/defaults.ini "$GF_PATHS_CONFIG"; \61 cp conf/defaults.ini "$GF_PATHS_CONFIG"; \
62 cp conf/ldap.toml /etc/grafana/ldap.toml; \62 cp conf/ldap.toml /etc/grafana/ldap.toml; \
63 chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"; \63 chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"; \
64 chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"; \64 chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"; \
65 mkdir -p /usr/share/rocks; \65 mkdir -p /usr/share/rocks; \
66# create deb manifest66 # create deb manifest
67 (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.query67 (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
6868
69COPY --from=snap-installer /snap/grafana/bin/grafana-server /snap/grafana/bin/grafana-cli bin/69COPY --from=snap-installer /snap/grafana/bin/grafana-server /snap/grafana/bin/grafana-cli bin/
70COPY --from=snap-installer /snap/grafana/public public70COPY --from=snap-installer /snap/grafana/public public

Subscribers

People subscribed via source and target branches

to all changes: