Ubuntu Docker Images

Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf:telegraf-manifest-20.04 into ~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf:1.15-20.04

  1. Git
  2. lp:~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf
  3. telegraf-manifest-20.04
  4. Merge into 1.15-20.04
Proposed by Sergio Durigan Junior
Status: Merged
Merged at revision: 0d074cd80ce46ad0b6914a7a2734270be775f262
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf:telegraf-manifest-20.04
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf:1.15-20.04
Diff against target: 37 lines (+10/-2)
1 file modified
Dockerfile (+10/-2)
Reviewer Review Type Date Requested Status
Bryce Harrington Approve
Canonical Server Pending
Review via email: mp+400353@code.launchpad.net

Description of the change

Implement manifest generation for the telegraf image on 20.04.

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

LGTM, +1

Verified docker builds the image.

Step 12/12 : CMD [ "--config=/etc/telegraf/telegraf.conf", "--config-directory=/etc/telegraf/telegraf.d" ]
 ---> Running in 9649715ba06d
Removing intermediate container 9649715ba06d
 ---> 871dd38c9ca8
Successfully built 871dd38c9ca8

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 40efc45..042a96e 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -8,7 +8,8 @@ RUN set -eux; \
6 apt-get update; \
7 DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
8 DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
9- dpkg-dev git ca-certificates pristine-tar; \
10+ dpkg-dev git ca-certificates pristine-tar \
11+ python3 python3-lxml python3-requests; \
12 git clone https://git.launchpad.net/~ubuntu-server/ubuntu/+source/telegraf; \
13 cd telegraf; \
14 git branch pristine-tar origin/pristine-tar; \
15@@ -20,7 +21,12 @@ github.com/influxdata/telegraf/plugins/inputs/zipkin \
16 github.com/influxdata/telegraf/plugins/outputs/prometheus_client \\@' debian/rules; \
17 pristine-tar checkout ../telegraf_$(dpkg-parsechangelog -SVersion | sed 's/\(.*\)-.ubuntu.*/\1/').orig.tar.xz; \
18 DEBIAN_FRONTEND=noninteractive apt-get build-dep . -y; \
19- dpkg-buildpackage -us -uc
20+ dpkg-buildpackage -us -uc; \
21+ cd /src/telegraf; \
22+ git clone https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/utils; \
23+ cd telegraf/vendor; \
24+ go list -m all | tail -n +2 > /src/telegraf/telegraf-mods.txt; \
25+ /src/telegraf/utils/golang-manifest-builder.py /src/telegraf/telegraf-mods.txt | tee /src/telegraf/manifest-upstream.txt
26
27 FROM ubuntu:focal
28
29@@ -42,6 +48,8 @@ RUN set -eux; \
30 mkdir -p /usr/share/rocks; \
31 (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
32
33+COPY --from=builder /src/telegraf/manifest-upstream.txt /usr/share/rocks/upstream
34+
35 EXPOSE 9273
36 ENTRYPOINT [ "/usr/bin/telegraf" ]
37 CMD [ "--config=/etc/telegraf/telegraf.conf", \

Subscribers

People subscribed via source and target branches

to all changes: