Ubuntu Docker Images

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

Proposed by Bryce Harrington on 2021-02-18

Status:	Merged
Merge reported by:	Bryce Harrington
Merged at revision:	a77ff6d0c45cbcc1d68a3e2ba9b47352d8ee8479
Proposed branch:	~ubuntu-docker-images/ubuntu-docker-images/+git/nginx:1.18-21.04
Merge into:	~ubuntu-docker-images/ubuntu-docker-images/+git/nginx:edge
Diff against target:	23 lines (+2/-2) 2 files modified Dockerfile (+1/-1) data/nginx.yaml (+1/-1)
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Sergio Durigan Junior		2021-02-18	Pending
Review via email: mp+398215@code.launchpad.net

Update nginx docker image to hirsute for the 1.18-21.04 branch

a77ff6d... by Bryce Harrington on 2021-02-18: Update docker image to 1.18.0-6ubuntu4 for hirsute

Revision history for this message

Bryce Harrington (bryce) wrote on 2021-02-24:

ubuntu/nginx-21.04 is present at https://hub.docker.com/u/ubuntu

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	diff --git a/Dockerfile b/Dockerfile
2	index 8808835..f8e832f 100644
3	--- a/Dockerfile
4	+++ b/Dockerfile
5	@@ -1,4 +1,4 @@
6	-FROM ubuntu:focal
7	+FROM ubuntu:hirsute
8
9	ENV TZ UTC
10
11	diff --git a/data/nginx.yaml b/data/nginx.yaml
12	index 63f8c21..67d6d2b 100644
13	--- a/data/nginx.yaml
14	+++ b/data/nginx.yaml
15	@@ -4,7 +4,7 @@ repo: nginx
16	description: >
17	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/).
18	version: 1.18.0
19	-base: Ubuntu 20.04 LTS
20	+base: Ubuntu 21.04 LTS
21	architectures:
22	- amd64
23	- arm64