Ubuntu Docker Images

Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:add-manifest into ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:edge

  1. Git
  2. lp:~ubuntu-docker-images/ubuntu-docker-images/+git/grafana
  3. add-manifest
  4. Merge into edge
Proposed by Sergio Durigan Junior
Status: Merged
Merge reported by: Sergio Durigan Junior
Merged at revision: 6a0fb6ff28335ba4bf69e496d85a57d7ace3a900
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:add-manifest
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:edge
Diff against target: 25 lines (+6/-1)
1 file modified
Dockerfile (+6/-1)
Reviewer Review Type Date Requested Status
Lucas Kanashiro Approve
Canonical Server Pending
Review via email: mp+397676@code.launchpad.net

Description of the change

This adds manifest files to the grafana OCI image.

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

This was done following what Jamie described in https://bugs.launchpad.net/ubuntu-docker-images/+bug/1905052.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

LGTM, +1.

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, pushed.

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..18ef091 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -57,7 +57,8 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
6 "$GF_PATHS_DATA" && \
7 cp conf/defaults.ini "$GF_PATHS_CONFIG" && \
8 chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
9- chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
10+ chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
11+ mkdir -p /usr/share/rocks
12
13 # XXX - removed from above RUN, not in the snap yet
14 RUN if [ -f conf/ldap.toml ]; then cp conf/ldap.toml /etc/grafana/ldap.toml; fi
15@@ -66,6 +67,10 @@ COPY --from=snap-installer /snap/grafana/bin/grafana-server /snap/grafana/bin/gr
16 COPY --from=snap-installer /snap/grafana/public public
17 COPY --from=snap-installer /snap/grafana/tools tools
18
19+# Copy the manifest files from the snap
20+COPY --from=snap-installer /snap/grafana/snap/snapcraft.yaml /usr/share/rocks/
21+COPY --from=snap-installer /snap/grafana/snap/manifest.yaml /usr/share/rocks/
22+
23 COPY bin/docker-run.sh /run.sh
24
25 USER grafana

Subscribers

People subscribed via source and target branches

to all changes: