Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/redis:6.0-21.10-wip into ~ubuntu-docker-images/ubuntu-docker-images/+git/redis:6.0-21.04

[Athos Ribeiro]

This change creates the redis OCI image for impish.

Just the trivial changes were needed and no regressions were detected when running the unit test.

Note that this MP is targeting the 6.0-21.04 branch solely for comparing purposes. When accepted, these changes should be pushed into a new 6.0-21.10 branch.

[Sergio Durigan Junior (sergiodj)]

Heh, there's a "thinko" in the MP description: this is the redis OCI image, not apache2's :-P.

Other than that, this LGTM. I've built and tested it locally and everything passes indeed. Thanks!

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Pushed to 6.0-21.10 and removed the 6.0-21.10-wip branch

diff --git a/Dockerfile b/Dockerfile
index f7a24d6..01eed53 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:hirsute
+FROM ubuntu:impish
 
 ENV TZ UTC
 
diff --git a/HACKING.md b/HACKING.md
index 9c274c0..74898e4 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,7 +1,7 @@
 # Contributing
 
 In Ubuntu, Redis is available as a `.deb` package.  For this reason,
-this image was built by installing the Redis Ubuntu 21.04 package
+this image was built by installing the Redis Ubuntu 21.10 package
 inside a docker container.
 
 In order to contribute to the Redis OCI image, do the following:
diff --git a/README.md b/README.md
index d3a02ff..9adf316 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/redis but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`6.0-21.04_beta`**    | | | Redis 6.0.9 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| **`6.0-21.10_beta`**    | | | Redis 6.0.9 on Ubuntu 21.10 | `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 redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.0-21.04_beta
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.0-21.10_beta
 ```
 Access your Redis server at `localhost:30073`.
 
@@ -67,7 +67,7 @@ This image also includes the `redis-cli` client for interactive container use:
 ```sh
 $ docker network create redis-network
 $ docker network connect redis-network redis-container
-$ docker run -it --rm --network redis-network ubuntu/redis:6.0-21.04_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container
 ```
 Now you can:
 ```
@@ -85,7 +85,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf) and
-[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.0-21.04_beta`), then:
+[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.0-21.10_beta`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
diff --git a/data/redis.yaml b/data/redis.yaml
index 5cb6db2..75131cb 100644
--- a/data/redis.yaml
+++ b/data/redis.yaml
@@ -7,7 +7,7 @@ description: >
   Redis has built-in replication, Lua scripting, LRU eviction, transactions and different levels of on-disk persistence, and provides high availability via Redis Sentinel and automatic partitioning with Redis Cluster. 
   Read more on the [Redis website](https://redis.io/topics/introduction).
 version: 6.0.9
-base: Ubuntu 21.04
+base: Ubuntu 21.10
 architectures:
   - amd64
   - arm64