Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/nginx:1.18-21.04 into ~ubuntu-docker-images/ubuntu-docker-images/+git/nginx: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.

review: Approve

1f5c835... by Sergio Durigan Junior on 2021-03-02

Update README.md, HACKING.md and data/nginx.yaml

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

[Bryce Harrington (bryce)]

This is merged and complete

diff --git a/Dockerfile b/Dockerfile
index 8808835..ab31a36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,27 @@
-FROM ubuntu:focal
+FROM ubuntu:hirsute
 
 ENV TZ UTC
 
-RUN set -x \
+RUN set -eux; \
 # create nginx user/group first, to be consistent throughout docker variants
-    && addgroup --system --gid 101 nginx \
-    && adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
-    && apt-get update \
-    && apt-get install -y nginx-full gettext-base tzdata \
-    && apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* \
+	addgroup --system --gid 101 nginx; \
+	adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx; \
+# installation
+	apt-get update; \
+	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+		nginx-full \
+		gettext-base \
+		tzdata; \
+	DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y;
+	rm -rf /var/lib/apt/lists/*; \
 # create a docker-entrypoint.d directory
-    && mkdir /docker-entrypoint.d \
+	mkdir /docker-entrypoint.d; \
+# smoke test
+	nginx -V; \
 # 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;
 
 COPY docker-entrypoint.sh /
 COPY 20-envsubst-on-templates.sh /docker-entrypoint.d
diff --git a/HACKING.md b/HACKING.md
index 5d1fba4..73cbe1a 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 Focal package
+this image was built by installing the Nginx Ubuntu 21.04 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 f48b59c..2947d6f 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-20.04_beta`**    | | | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| **`1.18-21.04_beta`**    | | | Nginx 1.18.0 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 nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-20.04_beta
+docker run -d --name nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-21.04_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-20.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.04_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 63f8c21..711923e 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 20.04 LTS
+base: Ubuntu 21.04
 architectures:
   - amd64
   - arm64