Ubuntu Docker Images

Merge ~athos-ribeiro/ubuntu-docker-images/+git/grafana:7.4-21.04-deb-manifest into ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:7.4-21.04

  1. Git
  2. lp:~athos-ribeiro/ubuntu-docker-images/+git/grafana
  3. 7.4-21.04-deb-manifest
  4. Merge into 7.4-21.04
Proposed by Athos Ribeiro
Status: Merged
Merged at revision: 0fe2def3649662cd2b8c155a0cbef5161bd19a67
Proposed branch: ~athos-ribeiro/ubuntu-docker-images/+git/grafana:7.4-21.04-deb-manifest
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/grafana:7.4-21.04
Diff against target: 15 lines (+3/-1)
1 file modified
Dockerfile (+3/-1)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior Approve
Canonical Server Pending
Review via email: mp+413038@code.launchpad.net

Description of the change

Generate manifest to report installed deb packages

* https://bugs.launchpad.net/ubuntu-docker-images/+bug/1953697

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

LGTM.

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 beac394..d4102ab 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -58,7 +58,9 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
6 cp conf/defaults.ini "$GF_PATHS_CONFIG" && \
7 chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
8 chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
9- mkdir -p /usr/share/rocks
10+ mkdir -p /usr/share/rocks; \
11+# create deb manifest
12+ (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
13
14 # XXX - removed from above RUN, not in the snap yet
15 RUN if [ -f conf/ldap.toml ]; then cp conf/ldap.toml /etc/grafana/ldap.toml; fi

Subscribers

People subscribed via source and target branches