Merge ~valentinviennot/ubuntu-docker-images:update-redis-readme into ~ubuntu-docker-images/ubuntu-docker-images/+git/redis:edge

[Valentin Viennot]

Final review from latest meetings. This content has been generated by the templating tool proposal, with latest data and template.

https://bugs.launchpad.net/ubuntu-docker-images/+bug/1904931

Please check if everything seems fine and if I can go ahead in this direction.

[Richard Harding (rharding)]

+1 looks like a nice set of changes thanks for the additional polish on these.

review: Approve

diff --git a/README.md b/README.md
index 8acb9a8..404e629 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,29 @@
 # Redis | Ubuntu
 
-## About Redis
-
-"Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams. 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. [Learn more](https://redis.io/topics/introduction)." (from [redis.io](redis.io))
 
-## Tags
+## About Redis
 
-- `5.0.7-focal`, `5.0.7`, `5.0-focal`, `5.0`, `5-focal`, `5`, `focal`, `beta` - **/!\ this is a beta release**
+Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker.  It supports data structures such as strings, hashes, lists, sets, sorted sets with range queries, bitmaps, hyperloglogs, geospatial indexes with radius queries and streams.  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). 
 
-## Architectures supported
 
-* `amd64`, `arm64`, `ppc64el`, `s390x`
+## Tags and Architectures
 
+| Tag | Currently | Architectures |
+|---|---|---|
+| `5.x`    ![BETA](https://assets.ubuntu.com/v1/e8ac33d1-header-beta-flag.svg) | Redis 5.0.7 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
 
 ## Usage
-### Docker CLI
+
+Launch this image locally:
 
 ```sh
-$ docker run -d --name redis-container -p 30073:6379 -e TZ=UTC -e REDIS_PASSWORD=mypassword squeakywheel/redis:edge
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:5.x
 ```
 
-Access your Redis server at `localhost:30073`.
+Access your MySQL server at `localhost:30073`.
 
 #### Parameters
+
 | Parameter | Description |
 |---|---|
 | `-e TZ=UTC` | Timezone. |
@@ -32,122 +33,63 @@ Access your Redis server at `localhost:30073`.
 | `-e REDIS_ALLOW_REMOTE_CONNECTIONS=yes` | Set to `no` to disallow remote connections to `redis-server` (i.e., make `redis-server` listen to `127.0.0.1` only). |
 | `-e REDIS_EXTRA_FLAGS` | Specify extra flags to be passed to `redis-server` when initializing it. |
 | `-p 30073:6379` | Expose redis on `localhost:30073`. |
-| `-v /path/to/redis.conf:/etc/redis/redis.conf` | Mount local [configuration file](https://redis.io/topics/config) `redis.conf` (download this [example file](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf)). |
-
+| `-v /path/to/redis.conf:/etc/redis/redis.conf` | Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf)). |
 
 #### Testing/Debugging
 
-In case you need to debug what it is happening with the container you can run `docker logs <name_of_the_container>`. But if you want to get access to an interactive shell run:
+To debug the container:
 
 ```sh
-$ docker exec -it <name_of_the_container> /bin/bash
+$ docker logs -f redis-container
 ```
 
-With this same image, you can launch an interactive container with the `redis-cli` program,
-and connect to the `redis-server` that is running in the first container.
+To get an interactive shell:
 
 ```sh
-$ docker network create redis-network
-$ docker network connect redis-network redis-container
-$ docker run -it --network redis-network --rm squeakywheel/redis:edge redis-cli -h redis-container
+$ docker exec -it redis-container /bin/bash
+```
+
+This image also includes the redis-cli client for interactive container use:
+
+```sh
+$ docker network create redis-net
+$ docker network connect redis-net redis-container
+$ docker run -it --rm --network redis-net ubuntu/redis:5.x redis-cli -h redis-container
+```
+```
 redis:6379> AUTH mypassword
 OK
 redis:6379> PING
 PONG
 redis:6379>
+
 ```
 
-### Deploy with Kubernetes
 
-You can use your favorite Kubernetes distribution; if you don't have one, consider [installing MicroK8s](https://microk8s.io/).
+## Deploy with Kubernetes
 
-With microk8s running, enable the `dns` and `storage` add-ons:
+Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s enable dns storage` then alias `kubectl` to `microk8s.kubectl`.
 
-```sh
-$ microk8s enable dns storage
-```
+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). Then:
 
 ```sh
-$ microk8s kubectl create configmap redis-config --from-file=redis=config/redis.conf
-```
-
-Use the sample deployment yaml provided [here](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml).
-
-<details>
-  <summary>Apply the `redis-deployment.yml` (click to expand)</summary>
-
-```yaml
-# redis-deployment.yml
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: redis-deployment
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: redis
-  template:
-    metadata:
-      labels:
-        app: redis
-    spec:
-      containers:
-      - name: redis
-        image: squeakywheel/redis:edge
-        volumeMounts:
-        - name: redis-config-volume
-          mountPath: /etc/redis/redis.conf
-          subPath: redis.conf
-        ports:
-        - containerPort: 6379
-          name: redis
-          protocol: TCP
-      volumes:
-        - name: redis-config-volume
-          configMap:
-            name: redis-config
-            items:
-            - key: redis
-              path: redis.conf
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis-service
-spec:
-  type: NodePort
-  selector:
-    app: redis
-  ports:
-  - protocol: TCP
-    port: 6379
-    targetPort: 6379
-    nodePort: 30073
-    name: redis
-```
-</details>
-
-```
-$ microk8s kubectl apply -f redis-deployment.yml
+$ kubectl create configmap redis-config --from-file=redis.conf
+$ kubectl apply -f redis-deployment.yml
 ```
 
 You will now be able to connect to the redis server on `localhost:30073`.
 
-## Bugs and Features request
-
-If you find a bug in our image or want to request a specific feature file a bug here:
+## Bugs and feature requests
 
-https://bugs.launchpad.net/ubuntu-docker-images/+filebug
+If you find a bug in our image or want to request a specific feature, please file a bug here:
 
-In the title of the bug add `redis: <reason>`.
+[https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug)
 
-Make sure to include:
+Please title the bug "`redis: <reason>`".
 
-* The digest of the image you are using, you can find it using this command replacing `<tag>` with the one you used to run the image:
+Make sure to include the digest of the image you are using, from:
 ```sh
-$ docker images --no-trunc --quiet squeakywheel/redis:<tag>
+$ docker images --no-trunc --quiet ubuntu/redis:<tag>
 ```
-* Reproduction steps for the deployment
-* If it is a feature request, please provide as much detail as possible