Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/nginx:1.18-21.10-wip into ~ubuntu-docker-images/ubuntu-docker-images/+git/nginx:1.18-21.04

[Athos Ribeiro]

This change creates the nginx 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 1.18-21.04 branch solely for comparing purposes. When accepted, these changes should be pushed into a new 1.18-21.10 branch.

[Sergio Durigan Junior (sergiodj)]

Thanks, this built fine. Unfortunately I'm unable to make the IPv6 test pass, but I verified that it's rather a docker issue, and not something related to the image. For this reason, LGTM. +1

review: Approve

[Athos Ribeiro (athos-ribeiro)]

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

diff --git a/Dockerfile b/Dockerfile
index 0ae3721..924554e 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 73cbe1a..02b6869 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,7 +1,7 @@
 # Contributing
 
 In Ubuntu, Nginx is available as a `.deb` package.  For this reason,
-this image was built by installing the Nginx Ubuntu 21.04 package
+this image was built by installing the Nginx Ubuntu 21.10 package
 inside a docker container.
 
 In order to contribute to the Nginx OCI image, do the following:
diff --git a/README.md b/README.md
index 2947d6f..fe62e1b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/nginx but are shown here for comple
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`1.18-21.04_beta`**    | | | Nginx 1.18.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| **`1.18-21.10_beta`**    | | | Nginx 1.18.0 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 nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-21.04_beta
+docker run -d --name nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-21.10_beta
 ```
 Access your Nginx server at `http://localhost:8080`.
 
@@ -66,7 +66,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html) and
-[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-21.04_beta`), then:
+[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-21.10_beta`), then:
 
 ```sh
 kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html
diff --git a/data/nginx.yaml b/data/nginx.yaml
index 711923e..522ca6b 100644
--- a/data/nginx.yaml
+++ b/data/nginx.yaml
@@ -4,7 +4,7 @@ repo: nginx
 description: >
   Nginx ("engine X") is a high-performance web and reverse proxy server created by Igor Sysoev. It can be used both as a standalone web server and as a proxy to reduce the load on back-end HTTP or mail servers. Read more on the [nginx website](https://www.nginx.com/).
 version: 1.18.0
-base: Ubuntu 21.04
+base: Ubuntu 21.10
 architectures:
   - amd64
   - arm64