Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/squid:4.13-21.04-wip into ~ubuntu-docker-images/ubuntu-docker-images/+git/squid:main

[Athos Ribeiro]

This is the proposed branch for the new squid hirsute OCI.

Note that this MP was filed against the main branch for review purposes only. After approval, a new 4.13-21.04 branch will be created.

I ran the squid OCI test suite for this new branch locally. Here are the results:

athos@pollux:~/src/server-test-scripts/oci-unit-tests$ DOCKER_IMAGE=localhost/squid:hirsute sh squid_test.sh
Error response from daemon: Get http://localhost/v2/: dial tcp 127.0.0.1:80: connect: connection refused
test_start_and_connect
test_start_and_connect_ipv6
test_custom_configuration
test_persistent_logs
test_persistent_cache
test_manifest_exists

Ran 6 tests.

OK

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos.

Built & tested locally, everything OK.

+1

review: Approve

diff --git a/Dockerfile b/Dockerfile
index f7a01f4..610df62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:impish
+FROM ubuntu:hirsute
 
 ENV TZ=UTC
 LABEL maintainer="Ubuntu Server team <[e-mail]>"
diff --git a/HACKING.md b/HACKING.md
index 39941c0..e29be91 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,7 +1,7 @@
 # Contributing
 
 In Ubuntu, Squid is available as a `.deb` package.  For this reason,
-this image was built by installing the Squid Ubuntu 21.10 package
+this image was built by installing the Squid Ubuntu 21.04 package
 inside a docker container.
 
 In order to contribute to the Squid OCI image, do the following:
diff --git a/README.md b/README.md
index 7eccbf1..0d7a024 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/squid but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`4.13-21.10_beta`** &nbsp;&nbsp; | | | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| **`4.13-21.04_beta`** &nbsp;&nbsp; | | | Squid 4.13 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
@@ -30,7 +30,7 @@ Channel tag shows the most stable channel for that track ordered `stable`, `cand
 Launch this image locally:
 
 ```sh
-docker run -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:4.13-21.10_beta
+docker run -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:4.13-21.04_beta
 ```
 Access your Squid proxy at `localhost:3128`.
 
@@ -65,7 +65,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [squid.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf) and
-[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:4.13-21.10_beta`), then:
+[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:4.13-21.04_beta`), then:
 
 ```sh
 kubectl create configmap squid-config --from-file=squid=squid.conf
diff --git a/data/squid.yaml b/data/squid.yaml
index 6f90f3c..759ea9f 100644
--- a/data/squid.yaml
+++ b/data/squid.yaml
@@ -8,7 +8,7 @@ description: >
   a great server accelerator. It runs on most available operating systems,
   including Windows and is licensed under the GNU GPL.
 version: "4.13"
-base: Ubuntu 21.10
+base: Ubuntu 21.04
 architectures:
   - amd64
   - arm64