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

[Bryce Harrington]

Enforce consistency across Dockerfile's

Please review with an eye towards cross-package standardization of packaging.
Particular strategic questions that this MP poses includes:

  * Should images adhere to base dist images, or fully update to current?
  * Perform smoke checks, consistently
  * Perform a full-upgrade on container before installing on it
  * Use --no-install-recommends
  * Use set -eux consistently

[Sergio Durigan Junior (sergiodj)]

LGTM, +1. (although the MP will not be merged into edge, of course).

review: Approve

ac0469f... by Sergio Durigan Junior on 2021-03-01

Add missing backslashes

Signed-off-by: Sergio Durigan Junior <email address hidden>

3b16fa2... by Sergio Durigan Junior on 2021-03-02

Update README.md and HACKING.md

Signed-off-by: Sergio Durigan Junior <email address hidden>

[Bryce Harrington (bryce)]

This is merged to the 21.04 branch, and complete

diff --git a/Dockerfile b/Dockerfile
index 3f2758d..f7a24d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,27 @@
-FROM ubuntu:focal
+FROM ubuntu:hirsute
 
 ENV TZ UTC
 
 RUN set -eux; \
-	apt-get update \
-	&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
+# installation
+	apt-get update; \
+	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
 # Needed for generating random passwords.
-	&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y pwgen redis-server tzdata \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& redis-server --version \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+		pwgen \
+		redis-server \
+		tzdata \
+		; \
+	DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \
+	rm -rf /var/lib/apt/lists/*; \
+# smoke test
+	redis-server --version; \
 # create manifest
-	&& mkdir -p /usr/share/rocks \
-	&& (echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query
+	mkdir -p /usr/share/rocks; \
+	(echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query;
 
-EXPOSE 6379
-
-RUN mkdir /data && chown redis:redis /data
+RUN mkdir /data; \
+	chown redis:redis /data
 VOLUME /data
 WORKDIR /data
 
@@ -23,4 +29,6 @@ COPY start-redis.sh /usr/local/bin/
 RUN ln -s /usr/local/bin/start-redis.sh /entrypoint.sh # backwards compat
 
 ENTRYPOINT [ "start-redis.sh" ]
+
+EXPOSE 6379
 CMD [ "redis-server" ]
diff --git a/HACKING.md b/HACKING.md
index d09b9a4..9c274c0 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 Focal package
+this image was built by installing the Redis Ubuntu 21.04 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 d45b62a..d3a02ff 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 |
 |---|---|---|---|---|
-| **`5.0-20.04_beta`**    | | | Redis 5.0.7 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| **`6.0-21.04_beta`**    | | | Redis 6.0.9 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 redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:5.0-20.04_beta
+docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.0-21.04_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:5.0-20.04_beta redis-cli -h redis-container
+$ docker run -it --rm --network redis-network ubuntu/redis:6.0-21.04_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:5.0-20.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.04_beta`), then:
 
 ```sh
 kubectl create configmap redis-config --from-file=redis=redis.conf
diff --git a/data/redis.yaml b/data/redis.yaml
index 74fba08..5cb6db2 100644
--- a/data/redis.yaml
+++ b/data/redis.yaml
@@ -6,8 +6,8 @@ description: >
   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).
-version: 5.0.7
-base: Ubuntu 20.04 LTS
+version: 6.0.9
+base: Ubuntu 21.04
 architectures:
   - amd64
   - arm64