Merge ~sergiodj/ubuntu-docker-images/+git/squid:5.2-22.04 into ~ubuntu-docker-images/ubuntu-docker-images/+git/squid:4.13-21.10

[Sergio Durigan Junior]

Update squid ROCKs image to Jammy. Tested locally, everything OK.

[Andreas Hasenack (ahasenack)]

Just for my own education, I see that the target branch is named after impish (21.10), what will it mean after this merges? We will have a jammy image, with jammy's squid, but on a branch named after impish?

[Sergio Durigan Junior (sergiodj)]

On Wednesday, February 02 2022, Andreas Hasenack wrote:

> Just for my own education, I see that the target branch is named after
> impish (21.10), what will it mean after this merges? We will have a
> jammy image, with jammy's squid, but on a branch named after impish?

This is something I use when we're creating an image for a new Ubuntu
series. Targetting the branch for the previous release eases the
process of review, but when this gets approved it will get its own
XX.YY-22.04 branch.

In a way, this is similar to the trick we use for regular package
merges, when we target the "debian/sid" branch on the MP.

Thanks,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Athos Ribeiro (athos-ribeiro)]

LGTM

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thanks. Merged.

diff --git a/Dockerfile b/Dockerfile
index f7a01f4..8db1ae5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:impish
+FROM ubuntu:jammy
 
 ENV TZ=UTC
 LABEL maintainer="Ubuntu Server team <[e-mail]>"