Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus:2.32-20.04 into ~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus:2.28-21.10

Proposed by Sergio Durigan Junior
Status: Merged
Merge reported by: Sergio Durigan Junior
Merged at revision: 772d18c8f2b3ea892550ced25000b757dbd788b0
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus:2.32-20.04
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus:2.28-21.10
Diff against target: 23 lines (+3/-3)
1 file modified
Dockerfile (+3/-3)
Reviewer Review Type Date Requested Status
Bryce Harrington Approve
Athos Ribeiro Pending
Canonical Server Pending
Review via email: mp+414441@code.launchpad.net

Description of the change

This MP updates the prometheus 20.04 OCI image to the latest upstream version, 2.32.1.

I'm using the 21.10 Dockerfile as a base; that's why this is targeted to the 21.10 branch.

Our unit tests are passing. Bear in mind that in order to speed up the process I went ahead and already pushed the branch to the official repository, updated the OCI recipe and triggered builds. This MP is more of a formality; I just would like another pair of eyes to take a look and see if I didn't miss anything.

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

+1, lgtm

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

Thanks, Bryce. Setting as Merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index 06d25f8..cebab0e 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -1,4 +1,4 @@
6-FROM ubuntu:impish AS snap-installer
7+FROM ubuntu:focal AS snap-installer
8
9 RUN set -eux; \
10 apt-get update; \
11@@ -7,11 +7,11 @@ RUN set -eux; \
12 jq curl ca-certificates squashfs-tools; \
13 # taken from https://snapcraft.io/docs/build-on-docker
14 # Alternatively, we can install snapd, and issue `snap download prometheus`
15- 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/prometheus?channel=21.10/edge' | jq '.download_url' -r) --output prometheus.snap; \
16+ 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/prometheus?channel=20.04/edge' | jq '.download_url' -r) --output prometheus.snap; \
17 mkdir -p /snap; \
18 unsquashfs -d /snap/prometheus prometheus.snap
19
20-FROM ubuntu:impish
21+FROM ubuntu:focal
22
23 ENV TZ UTC
24

Subscribers

People subscribed via source and target branches