Merge ~cjdc/ubuntu-docker-images/+git/templates:fix-ubuntu-docs into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main

Proposed by Cristovao Cordeiro
Status: Merged
Merged at revision: 08631a0386790a72fe0ddb5479976e1775a18c87
Proposed branch: ~cjdc/ubuntu-docker-images/+git/templates:fix-ubuntu-docs
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main
Diff against target: 1458 lines (+461/-133)
61 files modified
.gitignore (+1/-0)
docs/docker.io/ubuntu/apache2.md (+3/-3)
docs/docker.io/ubuntu/bind9.md (+3/-3)
docs/docker.io/ubuntu/cassandra.md (+1/-1)
docs/docker.io/ubuntu/cortex.md (+1/-1)
docs/docker.io/ubuntu/grafana.md (+1/-1)
docs/docker.io/ubuntu/kafka.md (+1/-1)
docs/docker.io/ubuntu/loki.md (+1/-1)
docs/docker.io/ubuntu/memcached.md (+3/-3)
docs/docker.io/ubuntu/mysql.md (+3/-3)
docs/docker.io/ubuntu/nginx.md (+3/-3)
docs/docker.io/ubuntu/postgres.md (+3/-3)
docs/docker.io/ubuntu/prometheus-alertmanager.md (+1/-1)
docs/docker.io/ubuntu/prometheus.md (+1/-1)
docs/docker.io/ubuntu/redis.md (+2/-2)
docs/docker.io/ubuntu/squid.md (+3/-3)
docs/docker.io/ubuntu/telegraf.md (+2/-2)
docs/docker.io/ubuntu/ubuntu.md (+102/-0)
docs/docker.io/ubuntu/zookeeper.md (+1/-1)
docs/public.ecr.aws/lts/apache2.md (+3/-3)
docs/public.ecr.aws/lts/bind9.md (+3/-3)
docs/public.ecr.aws/lts/cassandra.md (+1/-1)
docs/public.ecr.aws/lts/cortex.md (+1/-1)
docs/public.ecr.aws/lts/grafana.md (+1/-1)
docs/public.ecr.aws/lts/kafka.md (+1/-1)
docs/public.ecr.aws/lts/loki.md (+1/-1)
docs/public.ecr.aws/lts/memcached.md (+2/-2)
docs/public.ecr.aws/lts/mysql.md (+3/-3)
docs/public.ecr.aws/lts/nginx.md (+3/-3)
docs/public.ecr.aws/lts/postgres.md (+3/-3)
docs/public.ecr.aws/lts/prometheus-alertmanager.md (+1/-1)
docs/public.ecr.aws/lts/prometheus.md (+1/-1)
docs/public.ecr.aws/lts/redis.md (+1/-1)
docs/public.ecr.aws/lts/squid.md (+3/-3)
docs/public.ecr.aws/lts/telegraf.md (+1/-1)
docs/public.ecr.aws/lts/ubuntu.md (+34/-0)
docs/public.ecr.aws/lts/usage/ubuntu.md (+44/-0)
docs/public.ecr.aws/lts/zookeeper.md (+1/-1)
docs/public.ecr.aws/ubuntu/apache2.md (+6/-5)
docs/public.ecr.aws/ubuntu/bind9.md (+6/-5)
docs/public.ecr.aws/ubuntu/cassandra.md (+2/-1)
docs/public.ecr.aws/ubuntu/cortex.md (+2/-1)
docs/public.ecr.aws/ubuntu/grafana.md (+2/-1)
docs/public.ecr.aws/ubuntu/kafka.md (+2/-1)
docs/public.ecr.aws/ubuntu/loki.md (+2/-1)
docs/public.ecr.aws/ubuntu/memcached.md (+5/-4)
docs/public.ecr.aws/ubuntu/mysql.md (+6/-5)
docs/public.ecr.aws/ubuntu/nginx.md (+6/-5)
docs/public.ecr.aws/ubuntu/postgres.md (+6/-5)
docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md (+2/-1)
docs/public.ecr.aws/ubuntu/prometheus.md (+2/-1)
docs/public.ecr.aws/ubuntu/redis.md (+3/-2)
docs/public.ecr.aws/ubuntu/squid.md (+6/-5)
docs/public.ecr.aws/ubuntu/telegraf.md (+3/-2)
docs/public.ecr.aws/ubuntu/ubuntu.md (+56/-0)
docs/public.ecr.aws/ubuntu/usage/ubuntu.md (+45/-0)
docs/public.ecr.aws/ubuntu/zookeeper.md (+2/-1)
templates/README_DOCKERHUB.md (+16/-8)
templates/README_ECR.md (+21/-10)
templates/README_ECR_LTS.md (+15/-5)
templates/ubuntu.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Tomáš Virtus Approve
Valentin Viennot (community) Approve
Ubuntu Docker Images Pending
Review via email: mp+434166@code.launchpad.net

Commit message

docs: update all docs

fix: improve and fix docs
 - Fix typos
 - Create column of OCI tag aliases
 - Fix LTS and ESM logo links

To post a comment you must log in.
Revision history for this message
Valentin Viennot (valentinviennot) wrote :

LGTM. Based on our discussions, the only suggestion would be rephrasing the sentence "...might be available..." to "The following tags might not be available in public.ecr.aws/ubuntu/ubuntu, but are available in Canonical's ESM service. They are shown here for completeness." — if that helps clarify the intent to the user. Thanks!

review: Approve
Revision history for this message
Tomáš Virtus (virtustom) wrote :

LGTM

review: Approve
Revision history for this message
Cristovao Cordeiro (cjdc) wrote :

@valentinviennot, done

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index c7c6720..7f8a775 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -1,4 +1,5 @@
6 .env
7+.vscode
8 *.swp
9 RenderDown/
10 __pycache__
11diff --git a/docs/docker.io/ubuntu/apache2.md b/docs/docker.io/ubuntu/apache2.md
12index c99ce70..4549ece 100644
13--- a/docs/docker.io/ubuntu/apache2.md
14+++ b/docs/docker.io/ubuntu/apache2.md
15@@ -18,9 +18,9 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
16
17 | Channel Tags | | | Currently | Architectures |
18 |---|---|---|---|---|
19- | **`2.4-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
20- | `2.4-21.10_beta` &nbsp;&nbsp; | - | - <br> | Apache2 2.4.48 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
21- | `2.4-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
22+ | **`2.4-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
23+ | `2.4-21.10_beta` | - | - | Apache2 2.4.48 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
24+ | `2.4-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
25 | _`track_risk`_ |
26
27
28diff --git a/docs/docker.io/ubuntu/bind9.md b/docs/docker.io/ubuntu/bind9.md
29index 08d3f7e..dc7f21c 100644
30--- a/docs/docker.io/ubuntu/bind9.md
31+++ b/docs/docker.io/ubuntu/bind9.md
32@@ -18,9 +18,9 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
33
34 | Channel Tags | | | Currently | Architectures |
35 |---|---|---|---|---|
36- | **`9.18-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
37- | `9.16-21.10_beta` &nbsp;&nbsp; | - | - <br> | Bind9 9.16.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
38- | `9.16-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
39+ | **`9.18-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
40+ | `9.16-21.10_beta` | - | - | Bind9 9.16.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
41+ | `9.16-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
42 | _`track_risk`_ |
43
44
45diff --git a/docs/docker.io/ubuntu/cassandra.md b/docs/docker.io/ubuntu/cassandra.md
46index 706d084..3fbb412 100644
47--- a/docs/docker.io/ubuntu/cassandra.md
48+++ b/docs/docker.io/ubuntu/cassandra.md
49@@ -29,7 +29,7 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
50
51 | Channel Tags | | | Currently | Architectures |
52 |---|---|---|---|---|
53- | **`4.0-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Apache Cassandra 4.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
54+ | **`4.0-22.04_beta`** | - | - | Apache Cassandra 4.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
55 | _`track_risk`_ |
56
57
58diff --git a/docs/docker.io/ubuntu/cortex.md b/docs/docker.io/ubuntu/cortex.md
59index 98bacbe..75f155b 100644
60--- a/docs/docker.io/ubuntu/cortex.md
61+++ b/docs/docker.io/ubuntu/cortex.md
62@@ -25,7 +25,7 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
63
64 | Channel Tags | | | Currently | Architectures |
65 |---|---|---|---|---|
66- | **`1.11-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Cortex 1.11 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
67+ | **`1.11-22.04_beta`** | - | - | Cortex 1.11 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
68 | _`track_risk`_ |
69
70
71diff --git a/docs/docker.io/ubuntu/grafana.md b/docs/docker.io/ubuntu/grafana.md
72index 2388afa..5a0f86e 100644
73--- a/docs/docker.io/ubuntu/grafana.md
74+++ b/docs/docker.io/ubuntu/grafana.md
75@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
76
77 | Channel Tags | | | Currently | Architectures |
78 |---|---|---|---|---|
79- | **`8.2-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Grafana™ software 8.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
80+ | **`8.2-22.04_beta`** | - | - | Grafana™ software 8.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
81 | _`track_risk`_ |
82
83
84diff --git a/docs/docker.io/ubuntu/kafka.md b/docs/docker.io/ubuntu/kafka.md
85index 0e37aec..f2d40ce 100644
86--- a/docs/docker.io/ubuntu/kafka.md
87+++ b/docs/docker.io/ubuntu/kafka.md
88@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
89
90 | Channel Tags | | | Currently | Architectures |
91 |---|---|---|---|---|
92- | **`3.1-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Apache Kafka 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
93+ | **`3.1-22.04_beta`** | - | - | Apache Kafka 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
94 | _`track_risk`_ |
95
96
97diff --git a/docs/docker.io/ubuntu/loki.md b/docs/docker.io/ubuntu/loki.md
98index 01fde14..403c841 100644
99--- a/docs/docker.io/ubuntu/loki.md
100+++ b/docs/docker.io/ubuntu/loki.md
101@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
102
103 | Channel Tags | | | Currently | Architectures |
104 |---|---|---|---|---|
105- | **`2.4-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Grafana Loki™ software 2.4.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
106+ | **`2.4-22.04_beta`** | - | - | Grafana Loki™ software 2.4.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
107 | _`track_risk`_ |
108
109
110diff --git a/docs/docker.io/ubuntu/memcached.md b/docs/docker.io/ubuntu/memcached.md
111index 5009145..215ff04 100644
112--- a/docs/docker.io/ubuntu/memcached.md
113+++ b/docs/docker.io/ubuntu/memcached.md
114@@ -18,9 +18,9 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
115
116 | Channel Tags | | | Currently | Architectures |
117 |---|---|---|---|---|
118- | **`1.6-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Memcached 1.6 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
119- | `1.6-21.10_beta` &nbsp;&nbsp; | - | - <br> | Memcached 1.6.9 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
120- | `1.5-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
121+ | **`1.6-22.04_beta`** | - | - | Memcached 1.6 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
122+ | `1.6-21.10_beta` | - | - | Memcached 1.6.9 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
123+ | `1.5-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
124 | _`track_risk`_ |
125
126
127diff --git a/docs/docker.io/ubuntu/mysql.md b/docs/docker.io/ubuntu/mysql.md
128index 9ae2525..363bcbc 100644
129--- a/docs/docker.io/ubuntu/mysql.md
130+++ b/docs/docker.io/ubuntu/mysql.md
131@@ -18,9 +18,9 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
132
133 | Channel Tags | | | Currently | Architectures |
134 |---|---|---|---|---|
135- | **`8.0-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
136- | `8.0-21.10_beta` &nbsp;&nbsp; | - | - <br> | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
137- | `8.0-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
138+ | **`8.0-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
139+ | `8.0-21.10_beta` | - | - | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
140+ | `8.0-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
141 | _`track_risk`_ |
142
143
144diff --git a/docs/docker.io/ubuntu/nginx.md b/docs/docker.io/ubuntu/nginx.md
145index d0b65bb..18afed9 100644
146--- a/docs/docker.io/ubuntu/nginx.md
147+++ b/docs/docker.io/ubuntu/nginx.md
148@@ -18,9 +18,9 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
149
150 | Channel Tags | | | Currently | Architectures |
151 |---|---|---|---|---|
152- | **`1.18-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
153- | `1.18-21.10_beta` &nbsp;&nbsp; | - | - <br> | Nginx 1.18.0 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
154- | `1.18-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
155+ | **`1.18-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
156+ | `1.18-21.10_beta` | - | - | Nginx 1.18.0 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
157+ | `1.18-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
158 | _`track_risk`_ |
159
160
161diff --git a/docs/docker.io/ubuntu/postgres.md b/docs/docker.io/ubuntu/postgres.md
162index 416dcc0..af5d347 100644
163--- a/docs/docker.io/ubuntu/postgres.md
164+++ b/docs/docker.io/ubuntu/postgres.md
165@@ -18,9 +18,9 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
166
167 | Channel Tags | | | Currently | Architectures |
168 |---|---|---|---|---|
169- | **`14-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
170- | `13-21.10_beta` &nbsp;&nbsp; | - | - <br> | Postgres 13.1 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
171- | `12-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
172+ | **`14-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
173+ | `13-21.10_beta` | - | - | Postgres 13.1 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
174+ | `12-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
175 | _`track_risk`_ |
176
177
178diff --git a/docs/docker.io/ubuntu/prometheus-alertmanager.md b/docs/docker.io/ubuntu/prometheus-alertmanager.md
179index a777714..6f9aaea 100644
180--- a/docs/docker.io/ubuntu/prometheus-alertmanager.md
181+++ b/docs/docker.io/ubuntu/prometheus-alertmanager.md
182@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
183
184 | Channel Tags | | | Currently | Architectures |
185 |---|---|---|---|---|
186- | **`0.23-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Prometheus Alertmanager 0.23 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
187+ | **`0.23-22.04_beta`** | - | - | Prometheus Alertmanager 0.23 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
188 | _`track_risk`_ |
189
190
191diff --git a/docs/docker.io/ubuntu/prometheus.md b/docs/docker.io/ubuntu/prometheus.md
192index 30fc9b7..d50cd2c 100644
193--- a/docs/docker.io/ubuntu/prometheus.md
194+++ b/docs/docker.io/ubuntu/prometheus.md
195@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
196
197 | Channel Tags | | | Currently | Architectures |
198 |---|---|---|---|---|
199- | **`2.33-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Prometheus 2.33 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
200+ | **`2.33-22.04_beta`** | - | - | Prometheus 2.33 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
201 | _`track_risk`_ |
202
203
204diff --git a/docs/docker.io/ubuntu/redis.md b/docs/docker.io/ubuntu/redis.md
205index 2c75035..a958668 100644
206--- a/docs/docker.io/ubuntu/redis.md
207+++ b/docs/docker.io/ubuntu/redis.md
208@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
209
210 | Channel Tags | | | Currently | Architectures |
211 |---|---|---|---|---|
212- | **`6.2-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Redis™ software 6.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
213- | `6.0-21.10_beta` &nbsp;&nbsp; | - | - <br> | Redis™ software 6.0.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
214+ | **`6.2-22.04_beta`** | - | - | Redis™ software 6.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
215+ | `6.0-21.10_beta` | - | - | Redis™ software 6.0.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
216 | _`track_risk`_ |
217
218
219diff --git a/docs/docker.io/ubuntu/squid.md b/docs/docker.io/ubuntu/squid.md
220index e581c7a..90f91b9 100644
221--- a/docs/docker.io/ubuntu/squid.md
222+++ b/docs/docker.io/ubuntu/squid.md
223@@ -18,9 +18,9 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
224
225 | Channel Tags | | | Currently | Architectures |
226 |---|---|---|---|---|
227- | **`5.2-22.04_beta`** &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
228- | `4.13-21.10_beta` &nbsp;&nbsp; | - | - <br> | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
229- | `4.10-20.04_beta` &nbsp;&nbsp; | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
230+ | **`5.2-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
231+ | `4.13-21.10_beta` | - | - | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
232+ | `4.10-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
233 | _`track_risk`_ |
234
235
236diff --git a/docs/docker.io/ubuntu/telegraf.md b/docs/docker.io/ubuntu/telegraf.md
237index ff4bf7b..6540c57 100644
238--- a/docs/docker.io/ubuntu/telegraf.md
239+++ b/docs/docker.io/ubuntu/telegraf.md
240@@ -18,8 +18,8 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
241
242 | Channel Tags | | | Currently | Architectures |
243 |---|---|---|---|---|
244- | **`1.21-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Telegraf™ software 1.21 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
245- | `1.19-21.10_beta` &nbsp;&nbsp; | - | - <br> | Telegraf™ software 1.19.2 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
246+ | **`1.21-22.04_beta`** | - | - | Telegraf™ software 1.21 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
247+ | `1.19-21.10_beta` | - | - | Telegraf™ software 1.19.2 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
248 | _`track_risk`_ |
249
250
251diff --git a/docs/docker.io/ubuntu/ubuntu.md b/docs/docker.io/ubuntu/ubuntu.md
252new file mode 100644
253index 0000000..d46be3d
254--- /dev/null
255+++ b/docs/docker.io/ubuntu/ubuntu.md
256@@ -0,0 +1,102 @@
257+# Ubuntu
258+
259+**The Ubuntu container image maintained by Canonical.** Receives fast security updates, and rolls to a new version every six months.
260+LTS releases every 2 years with a 5-year free security updates period. The Extended Security Maintenance (ESM) program provides up to 10-year security updates.
261+[Read more](https://ubuntu.com/about/release-cycle).
262+
263+This repository is maintained by the Canonical team and receives security updates quicker than the [Ubuntu](https://hub.docker.com/_/ubuntu) image from the Docker Official Images library. Both are fine to use; however, please be sure to use this repository if you applied for [commercial support](https://ubuntu.com/security/docker-images#get-in-touch). **This repository is free to use and exempted from per-user rate limits.**
264+
265+
266+## About Ubuntu
267+
268+![Ubuntu](https://assets.ubuntu.com/v1/adac6928-ubuntu.svg)
269+
270+Ubuntu is a Debian-based Linux operating system that runs from the desktop to the cloud, to all your internet connected things. It is the world's most popular operating system across public clouds and OpenStack clouds. It is the number one platform for containers; from Docker to Kubernetes to LXD, Ubuntu can run your containers at scale. Fast, secure and simple, Ubuntu powers millions of PCs worldwide. Read more on the [Ubuntu website](https://ubuntu.com/).
271+
272+## LTS Docker Image Portfolio
273+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) is a set of consistent, compliant, minimal and secure Ubuntu-based container images with Extended Security Maintenance (ESM) commitments from Canonical.
274+
275+## Tags and Architectures
276+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
277+Up to 5 years free security maintenance on LTS channels.
278+
279+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
280+Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch).
281+
282+
283+| Channel Tags | foo | | | Currently | Architectures |
284+|---|---|---|---|---|---|
285+ | **`22.10_stable`** | **`22.10`, `22.10_beta`, `22.10_candidate`, `22.10_edge`, `kinetic`, `kinetic-22.10_edge`, `latest`** | - | - | Ubuntu 22.10 "Kinetic Kudu" | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` |
286+ | `22.04_stable` | `22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `jammy`, `jammy-22.04_edge` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) <br>until 04/2027 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>until 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
287+ | `20.04_stable` | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `focal`, `focal-20.04_edge` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) <br>until 04/2025 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>until 04/2030 | Ubuntu 20.04 LTS "Focal Fossa" | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` |
288+ | `18.04_stable` | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `bionic`, `bionic-18.04_edge` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) <br>until 04/2023 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br>until 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver" | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` |
289+ | `23.04_edge` | `23.04`, `edge`, `lunar`, `lunar-23.04_edge` | - | - | Ubuntu 23.04 "Lunar Lobster" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
290+| _`track_risk`_ |
291+
292+_The following tags are not available in this repository but are shown here for completeness. [Contact Canonical for access](https://ubuntu.com/security/docker-images#get-in-touch)._
293+
294+| Channel Tag | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
295+|---|---|---|---|---|
296+| _`16.04_stable`_ &nbsp;&nbsp; | - | 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
297+| _`14.04_stable`_ &nbsp;&nbsp; | - | 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
298+| _`track_risk`_ |
299+
300+
301+Channel Tags 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`.
302+
303+### Commercial use and Extended Security Maintenance channels
304+If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com).
305+
306+## Usage
307+
308+Launch this image locally:
309+
310+```sh
311+docker run -d --name ubuntu-container -e TZ=UTC ubuntu/ubuntu:22.04_stable
312+```
313+
314+
315+#### Testing/Debugging
316+
317+To debug the container:
318+
319+```sh
320+docker logs -f ubuntu-container
321+```
322+
323+To get an interactive shell:
324+
325+```sh
326+docker exec -it ubuntu-container /bin/bash
327+```
328+
329+
330+
331+## Bugs and feature requests
332+
333+If you find a bug in our image or want to request a specific feature, please file a bug here:
334+
335+[https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug)
336+
337+Please title the bug "`ubuntu: <issue summary>`". Make sure to include the digest of the image you are using, from:
338+
339+```sh
340+docker images --no-trunc --quiet ubuntu/ubuntu:<tag>
341+```
342+
343+
344+## Deprecated channels & tags
345+These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
346+
347+| Track | Version | EOL | Upgrade Path |
348+|---|---|---|---|
349+ | ~~21.10-~~ | Ubuntu 21.10 "Impish Indri" | 07/2022 | 22.04_stable |
350+ | ~~21.04-~~ | Ubuntu 21.04 "Hirsute Hippo" | 01/2022 | ~~21.10~~ |
351+| _`track`_ |
352+
353+## Licensing
354+View [license information](https://www.ubuntu.com/about/about-ubuntu/licensing) for the software contained in this image.
355+
356+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.
357+
358+
359diff --git a/docs/docker.io/ubuntu/zookeeper.md b/docs/docker.io/ubuntu/zookeeper.md
360index 1b10c78..ed1c96a 100644
361--- a/docs/docker.io/ubuntu/zookeeper.md
362+++ b/docs/docker.io/ubuntu/zookeeper.md
363@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance [from Canonical's restricted reposi
364
365 | Channel Tags | | | Currently | Architectures |
366 |---|---|---|---|---|
367- | **`3.1-22.04_beta`** &nbsp;&nbsp; | - | - <br> | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
368+ | **`3.1-22.04_beta`** | - | - | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
369 | _`track_risk`_ |
370
371
372diff --git a/docs/public.ecr.aws/lts/apache2.md b/docs/public.ecr.aws/lts/apache2.md
373index 673b55f..323ef7c 100644
374--- a/docs/public.ecr.aws/lts/apache2.md
375+++ b/docs/public.ecr.aws/lts/apache2.md
376@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/apache2`. [Request
377
378 <!-- _Tags in italics are not available in public.ecr.aws/lts/apache2 but are shown here for completeness._ -->
379
380-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
381+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
382 |---|---|---|---|---|
383- | **`2.4-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
384- | `2.4-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
385+ | **`2.4-22.04_beta`** | 04/2027 | 04/2032 | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
386+ | `2.4-20.04_beta` | 04/2025 | 04/2030 | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
387 | _`track_risk`_ |
388
389 Channel Tags 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`.
390diff --git a/docs/public.ecr.aws/lts/bind9.md b/docs/public.ecr.aws/lts/bind9.md
391index e5448d5..92a046f 100644
392--- a/docs/public.ecr.aws/lts/bind9.md
393+++ b/docs/public.ecr.aws/lts/bind9.md
394@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/bind9`. [Request ac
395
396 <!-- _Tags in italics are not available in public.ecr.aws/lts/bind9 but are shown here for completeness._ -->
397
398-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
399+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
400 |---|---|---|---|---|
401- | **`9.18-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
402- | `9.16-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
403+ | **`9.18-22.04_beta`** | 04/2027 | 04/2032 | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
404+ | `9.16-20.04_beta` | 04/2025 | 04/2030 | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
405 | _`track_risk`_ |
406
407 Channel Tags 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`.
408diff --git a/docs/public.ecr.aws/lts/cassandra.md b/docs/public.ecr.aws/lts/cassandra.md
409index 7284240..2b527f4 100644
410--- a/docs/public.ecr.aws/lts/cassandra.md
411+++ b/docs/public.ecr.aws/lts/cassandra.md
412@@ -29,7 +29,7 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques
413
414 <!-- _Tags in italics are not available in public.ecr.aws/lts/cassandra but are shown here for completeness._ -->
415
416-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
417+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
418 |---|---|---|---|---|
419 | _`track_risk`_ |
420
421diff --git a/docs/public.ecr.aws/lts/cortex.md b/docs/public.ecr.aws/lts/cortex.md
422index 4ea818d..6e0a784 100644
423--- a/docs/public.ecr.aws/lts/cortex.md
424+++ b/docs/public.ecr.aws/lts/cortex.md
425@@ -25,7 +25,7 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a
426
427 <!-- _Tags in italics are not available in public.ecr.aws/lts/cortex but are shown here for completeness._ -->
428
429-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
430+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
431 |---|---|---|---|---|
432 | _`track_risk`_ |
433
434diff --git a/docs/public.ecr.aws/lts/grafana.md b/docs/public.ecr.aws/lts/grafana.md
435index c9ac009..e62480e 100644
436--- a/docs/public.ecr.aws/lts/grafana.md
437+++ b/docs/public.ecr.aws/lts/grafana.md
438@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request
439
440 <!-- _Tags in italics are not available in public.ecr.aws/lts/grafana but are shown here for completeness._ -->
441
442-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
443+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
444 |---|---|---|---|---|
445 | _`track_risk`_ |
446
447diff --git a/docs/public.ecr.aws/lts/kafka.md b/docs/public.ecr.aws/lts/kafka.md
448index 77bfa22..8a51d78 100644
449--- a/docs/public.ecr.aws/lts/kafka.md
450+++ b/docs/public.ecr.aws/lts/kafka.md
451@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance `from canonical/kafka`. [Request ac
452
453 <!-- _Tags in italics are not available in public.ecr.aws/lts/kafka but are shown here for completeness._ -->
454
455-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
456+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
457 |---|---|---|---|---|
458 | _`track_risk`_ |
459
460diff --git a/docs/public.ecr.aws/lts/loki.md b/docs/public.ecr.aws/lts/loki.md
461index 089eb82..053eec7 100644
462--- a/docs/public.ecr.aws/lts/loki.md
463+++ b/docs/public.ecr.aws/lts/loki.md
464@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance `from canonical/loki`. [Request acc
465
466 <!-- _Tags in italics are not available in public.ecr.aws/lts/loki but are shown here for completeness._ -->
467
468-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
469+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
470 |---|---|---|---|---|
471 | _`track_risk`_ |
472
473diff --git a/docs/public.ecr.aws/lts/memcached.md b/docs/public.ecr.aws/lts/memcached.md
474index 43073a7..cf8c3c4 100644
475--- a/docs/public.ecr.aws/lts/memcached.md
476+++ b/docs/public.ecr.aws/lts/memcached.md
477@@ -18,9 +18,9 @@ Up to 10 years customer security maintenance `from canonical/memcached`. [Reques
478
479 <!-- _Tags in italics are not available in public.ecr.aws/lts/memcached but are shown here for completeness._ -->
480
481-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
482+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
483 |---|---|---|---|---|
484- | **`1.5-20.04_beta`** &nbsp;&nbsp; | 04/2025 | 04/2030 | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
485+ | **`1.5-20.04_beta`** | 04/2025 | 04/2030 | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
486 | _`track_risk`_ |
487
488 Channel Tags 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`.
489diff --git a/docs/public.ecr.aws/lts/mysql.md b/docs/public.ecr.aws/lts/mysql.md
490index 3f3f9e1..a239157 100644
491--- a/docs/public.ecr.aws/lts/mysql.md
492+++ b/docs/public.ecr.aws/lts/mysql.md
493@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/mysql`. [Request ac
494
495 <!-- _Tags in italics are not available in public.ecr.aws/lts/mysql but are shown here for completeness._ -->
496
497-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
498+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
499 |---|---|---|---|---|
500- | **`8.0-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
501- | `8.0-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
502+ | **`8.0-22.04_beta`** | 04/2027 | 04/2032 | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
503+ | `8.0-20.04_beta` | 04/2025 | 04/2030 | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
504 | _`track_risk`_ |
505
506 Channel Tags 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`.
507diff --git a/docs/public.ecr.aws/lts/nginx.md b/docs/public.ecr.aws/lts/nginx.md
508index b9be55f..110aa1c 100644
509--- a/docs/public.ecr.aws/lts/nginx.md
510+++ b/docs/public.ecr.aws/lts/nginx.md
511@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/nginx`. [Request ac
512
513 <!-- _Tags in italics are not available in public.ecr.aws/lts/nginx but are shown here for completeness._ -->
514
515-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
516+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
517 |---|---|---|---|---|
518- | **`1.18-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
519- | `1.18-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
520+ | **`1.18-22.04_beta`** | 04/2027 | 04/2032 | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
521+ | `1.18-20.04_beta` | 04/2025 | 04/2030 | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
522 | _`track_risk`_ |
523
524 Channel Tags 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`.
525diff --git a/docs/public.ecr.aws/lts/postgres.md b/docs/public.ecr.aws/lts/postgres.md
526index 3b02358..3e9a3cd 100644
527--- a/docs/public.ecr.aws/lts/postgres.md
528+++ b/docs/public.ecr.aws/lts/postgres.md
529@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/postgres`. [Request
530
531 <!-- _Tags in italics are not available in public.ecr.aws/lts/postgres but are shown here for completeness._ -->
532
533-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
534+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
535 |---|---|---|---|---|
536- | **`14-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
537- | `12-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
538+ | **`14-22.04_beta`** | 04/2027 | 04/2032 | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
539+ | `12-20.04_beta` | 04/2025 | 04/2030 | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
540 | _`track_risk`_ |
541
542 Channel Tags 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`.
543diff --git a/docs/public.ecr.aws/lts/prometheus-alertmanager.md b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
544index 55cd77f..2f22357 100644
545--- a/docs/public.ecr.aws/lts/prometheus-alertmanager.md
546+++ b/docs/public.ecr.aws/lts/prometheus-alertmanager.md
547@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman
548
549 <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus-alertmanager but are shown here for completeness._ -->
550
551-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
552+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
553 |---|---|---|---|---|
554 | _`track_risk`_ |
555
556diff --git a/docs/public.ecr.aws/lts/prometheus.md b/docs/public.ecr.aws/lts/prometheus.md
557index 3321c8f..70cd8af 100644
558--- a/docs/public.ecr.aws/lts/prometheus.md
559+++ b/docs/public.ecr.aws/lts/prometheus.md
560@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque
561
562 <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus but are shown here for completeness._ -->
563
564-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
565+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
566 |---|---|---|---|---|
567 | _`track_risk`_ |
568
569diff --git a/docs/public.ecr.aws/lts/redis.md b/docs/public.ecr.aws/lts/redis.md
570index e4180e3..bbd7367 100644
571--- a/docs/public.ecr.aws/lts/redis.md
572+++ b/docs/public.ecr.aws/lts/redis.md
573@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac
574
575 <!-- _Tags in italics are not available in public.ecr.aws/lts/redis but are shown here for completeness._ -->
576
577-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
578+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
579 |---|---|---|---|---|
580 | _`track_risk`_ |
581
582diff --git a/docs/public.ecr.aws/lts/squid.md b/docs/public.ecr.aws/lts/squid.md
583index 7cab70f..9f737e3 100644
584--- a/docs/public.ecr.aws/lts/squid.md
585+++ b/docs/public.ecr.aws/lts/squid.md
586@@ -18,10 +18,10 @@ Up to 10 years customer security maintenance `from canonical/squid`. [Request ac
587
588 <!-- _Tags in italics are not available in public.ecr.aws/lts/squid but are shown here for completeness._ -->
589
590-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
591+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
592 |---|---|---|---|---|
593- | **`5.2-22.04_beta`** &nbsp;&nbsp; | 04/2027 | 04/2032 | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
594- | `4.10-20.04_beta` &nbsp;&nbsp; | 04/2025 | 04/2030 | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
595+ | **`5.2-22.04_beta`** | 04/2027 | 04/2032 | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
596+ | `4.10-20.04_beta` | 04/2025 | 04/2030 | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
597 | _`track_risk`_ |
598
599 Channel Tags 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`.
600diff --git a/docs/public.ecr.aws/lts/telegraf.md b/docs/public.ecr.aws/lts/telegraf.md
601index 382878a..396d2e9 100644
602--- a/docs/public.ecr.aws/lts/telegraf.md
603+++ b/docs/public.ecr.aws/lts/telegraf.md
604@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request
605
606 <!-- _Tags in italics are not available in public.ecr.aws/lts/telegraf but are shown here for completeness._ -->
607
608-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
609+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
610 |---|---|---|---|---|
611 | _`track_risk`_ |
612
613diff --git a/docs/public.ecr.aws/lts/ubuntu.md b/docs/public.ecr.aws/lts/ubuntu.md
614new file mode 100644
615index 0000000..4cf6972
616--- /dev/null
617+++ b/docs/public.ecr.aws/lts/ubuntu.md
618@@ -0,0 +1,34 @@
619+# Ubuntu
620+
621+
622+## LTS Docker Image Portfolio
623+The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are consistent, compliant, minimal and secure images with Extended Security Maintenance (ESM) commitments from Canonical.
624+
625+## About Ubuntu
626+
627+![Ubuntu](https://assets.ubuntu.com/v1/adac6928-ubuntu.svg)
628+
629+Ubuntu is a Debian-based Linux operating system that runs from the desktop to the cloud, to all your internet connected things. It is the world's most popular operating system across public clouds and OpenStack clouds. It is the number one platform for containers; from Docker to Kubernetes to LXD, Ubuntu can run your containers at scale. Fast, secure and simple, Ubuntu powers millions of PCs worldwide. Read more on the [Ubuntu website](https://ubuntu.com/).
630+
631+
632+## Tags and Architectures
633+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
634+Up to 5 years free security maintenance from this repository.
635+
636+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
637+Up to 10 years customer security maintenance `from canonical/ubuntu`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
638+
639+<!-- _Tags in italics are not available in public.ecr.aws/lts/ubuntu but are shown here for completeness._ -->
640+
641+| Channel Tags | | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
642+|---|---|---|---|---|---|
643+ | **`22.04_stable`** | **`22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `22.04_stable`, `edge`, `jammy`, `jammy-22.04_edge`, `latest`** | 04/2027 | 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
644+ | `20.04_stable` | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `20.04_stable`, `focal`, `focal-20.04_edge` | 04/2025 | 04/2030 | Ubuntu 20.04 LTS "Focal Fossa" | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` |
645+ | `18.04_stable` | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `18.04_stable`, `bionic`, `bionic-18.04_edge` | 04/2023 | 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver" | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` |
646+| _`track_risk`_ |
647+
648+Channel Tags 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`.
649+
650+### Commercial use and Extended Security Maintenance channels
651+If your usage includes redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com).
652+
653diff --git a/docs/public.ecr.aws/lts/usage/ubuntu.md b/docs/public.ecr.aws/lts/usage/ubuntu.md
654new file mode 100644
655index 0000000..1c152b9
656--- /dev/null
657+++ b/docs/public.ecr.aws/lts/usage/ubuntu.md
658@@ -0,0 +1,44 @@
659+
660+
661+
662+
663+
664+
665+## Docker CLI
666+
667+Launch this image locally:
668+
669+```sh
670+docker run -d --name ubuntu-container -e TZ=UTC public.ecr.aws/ubuntu/ubuntu:22.04_stable
671+```
672+
673+
674+#### Testing/Debugging
675+
676+To debug the container:
677+
678+```sh
679+docker logs -f ubuntu-container
680+```
681+
682+To get an interactive shell:
683+
684+```sh
685+docker exec -it ubuntu-container /bin/bash
686+```
687+
688+
689+
690+## Bugs and feature requests
691+
692+If you find a bug in our image or want to request a specific feature, please file a bug here:
693+
694+[https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug)
695+
696+Please title the bug "`ubuntu: <issue summary>`". Make sure to include the digest of the image you are using, from:
697+
698+```sh
699+docker images --no-trunc --quiet public.ecr.aws/ubuntu/ubuntu:<tag>
700+```
701+
702+
703diff --git a/docs/public.ecr.aws/lts/zookeeper.md b/docs/public.ecr.aws/lts/zookeeper.md
704index 972d375..f68ae79 100644
705--- a/docs/public.ecr.aws/lts/zookeeper.md
706+++ b/docs/public.ecr.aws/lts/zookeeper.md
707@@ -18,7 +18,7 @@ Up to 10 years customer security maintenance `from canonical/zookeeper`. [Reques
708
709 <!-- _Tags in italics are not available in public.ecr.aws/lts/zookeeper but are shown here for completeness._ -->
710
711-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
712+| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
713 |---|---|---|---|---|
714 | _`track_risk`_ |
715
716diff --git a/docs/public.ecr.aws/ubuntu/apache2.md b/docs/public.ecr.aws/ubuntu/apache2.md
717index 0f701c3..faa02ff 100644
718--- a/docs/public.ecr.aws/ubuntu/apache2.md
719+++ b/docs/public.ecr.aws/ubuntu/apache2.md
720@@ -1,5 +1,6 @@
721 # Apache2 | Ubuntu
722
723+
724 Current Apache2 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache2 or Ubuntu release.
725 For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/apache2](https://gallery.ecr.aws/lts/apache2).
726
727@@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/apache2`. [Request
728
729 | Channel Tags | | | Currently | Architectures |
730 |---|---|---|---|---|
731- | **`2.4-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
732- | `2.4-21.10_beta` &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/apache2) | [-](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.48 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
733+ | **`2.4-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
734+ | `2.4-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.48 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
735 | _`track_risk`_ |
736
737-_The following tags might not be available in public.ecr.aws/ubuntu/apache2 but are shown here for completeness:_
738+_The following tags might not be available in public.ecr.aws/ubuntu/apache2, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
739
740 | Channel Tags | | | Currently | Architectures |
741 |---|---|---|---|---|
742- | _**`2.4-22.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
743- | _`2.4-20.04_beta` &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
744+ | _**`2.4-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
745+ | _`2.4-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.41 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
746 | _`track_risk`_ |
747
748
749diff --git a/docs/public.ecr.aws/ubuntu/bind9.md b/docs/public.ecr.aws/ubuntu/bind9.md
750index d82f16c..0e17bcd 100644
751--- a/docs/public.ecr.aws/ubuntu/bind9.md
752+++ b/docs/public.ecr.aws/ubuntu/bind9.md
753@@ -1,5 +1,6 @@
754 # Bind9 | Ubuntu
755
756+
757 Current Bind9 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Bind9 or Ubuntu release.
758 For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/bind9](https://gallery.ecr.aws/lts/bind9).
759
760@@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/bind9`. [Request ac
761
762 | Channel Tags | | | Currently | Architectures |
763 |---|---|---|---|---|
764- | **`9.18-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
765- | `9.16-21.10_beta` &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/bind9) | [-](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
766+ | **`9.18-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
767+ | `9.16-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
768 | _`track_risk`_ |
769
770-_The following tags might not be available in public.ecr.aws/ubuntu/bind9 but are shown here for completeness:_
771+_The following tags might not be available in public.ecr.aws/ubuntu/bind9, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
772
773 | Channel Tags | | | Currently | Architectures |
774 |---|---|---|---|---|
775- | _**`9.18-22.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
776- | _`9.16-20.04_beta` &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
777+ | _**`9.18-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | Bind9 9.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
778+ | _`9.16-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.1 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
779 | _`track_risk`_ |
780
781
782diff --git a/docs/public.ecr.aws/ubuntu/cassandra.md b/docs/public.ecr.aws/ubuntu/cassandra.md
783index c5dc089..90e22be 100644
784--- a/docs/public.ecr.aws/ubuntu/cassandra.md
785+++ b/docs/public.ecr.aws/ubuntu/cassandra.md
786@@ -11,6 +11,7 @@ longer receive security updates.
787
788 # Apache Cassandra | Ubuntu
789
790+
791 Current Apache Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Cassandra or Ubuntu release.
792
793 ## About Apache Cassandra
794@@ -27,7 +28,7 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques
795
796 | Channel Tags | | | Currently | Architectures |
797 |---|---|---|---|---|
798- | **`4.0-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/cassandra) | [-](https://gallery.ecr.aws/lts/cassandra) | Apache Cassandra 4.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
799+ | **`4.0-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/cassandra) | Apache Cassandra 4.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
800 | _`track_risk`_ |
801
802
803diff --git a/docs/public.ecr.aws/ubuntu/cortex.md b/docs/public.ecr.aws/ubuntu/cortex.md
804index 9ad439c..422f89e 100644
805--- a/docs/public.ecr.aws/ubuntu/cortex.md
806+++ b/docs/public.ecr.aws/ubuntu/cortex.md
807@@ -1,5 +1,6 @@
808 # Cortex | Ubuntu
809
810+
811 Current Cortex Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cortex or Ubuntu release.
812
813 ## About Cortex
814@@ -23,7 +24,7 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a
815
816 | Channel Tags | | | Currently | Architectures |
817 |---|---|---|---|---|
818- | **`1.11-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/cortex) | [-](https://gallery.ecr.aws/lts/cortex) | Cortex 1.11 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
819+ | **`1.11-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/cortex) | Cortex 1.11 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
820 | _`track_risk`_ |
821
822
823diff --git a/docs/public.ecr.aws/ubuntu/grafana.md b/docs/public.ecr.aws/ubuntu/grafana.md
824index 48aed51..bb93f3b 100644
825--- a/docs/public.ecr.aws/ubuntu/grafana.md
826+++ b/docs/public.ecr.aws/ubuntu/grafana.md
827@@ -1,5 +1,6 @@
828 # Grafana™ software | Ubuntu
829
830+
831 Current Grafana™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana™ software or Ubuntu release.
832
833 ## About Grafana™ software
834@@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request
835
836 | Channel Tags | | | Currently | Architectures |
837 |---|---|---|---|---|
838- | **`8.2-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/grafana) | [-](https://gallery.ecr.aws/lts/grafana) | Grafana™ software 8.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
839+ | **`8.2-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/grafana) | Grafana™ software 8.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
840 | _`track_risk`_ |
841
842
843diff --git a/docs/public.ecr.aws/ubuntu/kafka.md b/docs/public.ecr.aws/ubuntu/kafka.md
844index 83042f1..82b4bb2 100644
845--- a/docs/public.ecr.aws/ubuntu/kafka.md
846+++ b/docs/public.ecr.aws/ubuntu/kafka.md
847@@ -1,5 +1,6 @@
848 # Apache Kafka | Ubuntu
849
850+
851 Current Apache Kafka Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Kafka or Ubuntu release.
852
853 ## About Apache Kafka
854@@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/kafka`. [Request ac
855
856 | Channel Tags | | | Currently | Architectures |
857 |---|---|---|---|---|
858- | **`3.1-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/kafka) | [-](https://gallery.ecr.aws/lts/kafka) | Apache Kafka 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
859+ | **`3.1-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/kafka) | Apache Kafka 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
860 | _`track_risk`_ |
861
862
863diff --git a/docs/public.ecr.aws/ubuntu/loki.md b/docs/public.ecr.aws/ubuntu/loki.md
864index cf98aef..4c3c9da 100644
865--- a/docs/public.ecr.aws/ubuntu/loki.md
866+++ b/docs/public.ecr.aws/ubuntu/loki.md
867@@ -1,5 +1,6 @@
868 # Grafana Loki™ software | Ubuntu
869
870+
871 Current Grafana Loki™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana Loki™ software or Ubuntu release.
872
873 ## About Grafana Loki™ software
874@@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/loki`. [Request acc
875
876 | Channel Tags | | | Currently | Architectures |
877 |---|---|---|---|---|
878- | **`2.4-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/loki) | [-](https://gallery.ecr.aws/lts/loki) | Grafana Loki™ software 2.4.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
879+ | **`2.4-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/loki) | Grafana Loki™ software 2.4.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
880 | _`track_risk`_ |
881
882
883diff --git a/docs/public.ecr.aws/ubuntu/memcached.md b/docs/public.ecr.aws/ubuntu/memcached.md
884index 4487878..c755896 100644
885--- a/docs/public.ecr.aws/ubuntu/memcached.md
886+++ b/docs/public.ecr.aws/ubuntu/memcached.md
887@@ -1,5 +1,6 @@
888 # Memcached | Ubuntu
889
890+
891 Current Memcached Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Memcached or Ubuntu release.
892 For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/memcached](https://gallery.ecr.aws/lts/memcached).
893
894@@ -17,15 +18,15 @@ Up to 10 years customer security maintenance `from canonical/memcached`. [Reques
895
896 | Channel Tags | | | Currently | Architectures |
897 |---|---|---|---|---|
898- | **`1.6-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/memcached) | [-](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
899- | `1.6-21.10_beta` &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/memcached) | [-](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6.9 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
900+ | **`1.6-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
901+ | `1.6-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6.9 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
902 | _`track_risk`_ |
903
904-_The following tags might not be available in public.ecr.aws/ubuntu/memcached but are shown here for completeness:_
905+_The following tags might not be available in public.ecr.aws/ubuntu/memcached, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
906
907 | Channel Tags | | | Currently | Architectures |
908 |---|---|---|---|---|
909- | _**`1.5-20.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/memcached) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/memcached) | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
910+ | _**`1.5-20.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/memcached) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/memcached) | Memcached 1.5.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
911 | _`track_risk`_ |
912
913
914diff --git a/docs/public.ecr.aws/ubuntu/mysql.md b/docs/public.ecr.aws/ubuntu/mysql.md
915index 0346a6f..1d0ba40 100644
916--- a/docs/public.ecr.aws/ubuntu/mysql.md
917+++ b/docs/public.ecr.aws/ubuntu/mysql.md
918@@ -1,5 +1,6 @@
919 # MySQL™ software | Ubuntu
920
921+
922 Current MySQL™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer MySQL™ software or Ubuntu release.
923 For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/mysql](https://gallery.ecr.aws/lts/mysql).
924
925@@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/mysql`. [Request ac
926
927 | Channel Tags | | | Currently | Architectures |
928 |---|---|---|---|---|
929- | **`8.0-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
930- | `8.0-21.10_beta` &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/mysql) | [-](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
931+ | **`8.0-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
932+ | `8.0-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.27 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
933 | _`track_risk`_ |
934
935-_The following tags might not be available in public.ecr.aws/ubuntu/mysql but are shown here for completeness:_
936+_The following tags might not be available in public.ecr.aws/ubuntu/mysql, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
937
938 | Channel Tags | | | Currently | Architectures |
939 |---|---|---|---|---|
940- | _**`8.0-22.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
941- | _`8.0-20.04_beta` &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
942+ | _**`8.0-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
943+ | _`8.0-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.22 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
944 | _`track_risk`_ |
945
946
947diff --git a/docs/public.ecr.aws/ubuntu/nginx.md b/docs/public.ecr.aws/ubuntu/nginx.md
948index 78ce0c9..da29bb0 100644
949--- a/docs/public.ecr.aws/ubuntu/nginx.md
950+++ b/docs/public.ecr.aws/ubuntu/nginx.md
951@@ -1,5 +1,6 @@
952 # Nginx | Ubuntu
953
954+
955 Current Nginx Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Nginx or Ubuntu release.
956 For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/nginx](https://gallery.ecr.aws/lts/nginx).
957
958@@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/nginx`. [Request ac
959
960 | Channel Tags | | | Currently | Architectures |
961 |---|---|---|---|---|
962- | **`1.18-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
963- | `1.18-21.10_beta` &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/nginx) | [-](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
964+ | **`1.18-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
965+ | `1.18-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
966 | _`track_risk`_ |
967
968-_The following tags might not be available in public.ecr.aws/ubuntu/nginx but are shown here for completeness:_
969+_The following tags might not be available in public.ecr.aws/ubuntu/nginx, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
970
971 | Channel Tags | | | Currently | Architectures |
972 |---|---|---|---|---|
973- | _**`1.18-22.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
974- | _`1.18-20.04_beta` &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
975+ | _**`1.18-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
976+ | _`1.18-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
977 | _`track_risk`_ |
978
979
980diff --git a/docs/public.ecr.aws/ubuntu/postgres.md b/docs/public.ecr.aws/ubuntu/postgres.md
981index 9a1d5ee..b200904 100644
982--- a/docs/public.ecr.aws/ubuntu/postgres.md
983+++ b/docs/public.ecr.aws/ubuntu/postgres.md
984@@ -1,5 +1,6 @@
985 # Postgres | Ubuntu
986
987+
988 Current Postgres Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Postgres or Ubuntu release.
989 For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/postgres](https://gallery.ecr.aws/lts/postgres).
990
991@@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/postgres`. [Request
992
993 | Channel Tags | | | Currently | Architectures |
994 |---|---|---|---|---|
995- | **`14-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
996- | `13-21.10_beta` &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/postgres) | [-](https://gallery.ecr.aws/lts/postgres) | Postgres 13.1 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
997+ | **`14-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
998+ | `13-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/postgres) | Postgres 13.1 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
999 | _`track_risk`_ |
1000
1001-_The following tags might not be available in public.ecr.aws/ubuntu/postgres but are shown here for completeness:_
1002+_The following tags might not be available in public.ecr.aws/ubuntu/postgres, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
1003
1004 | Channel Tags | | | Currently | Architectures |
1005 |---|---|---|---|---|
1006- | _**`14-22.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1007- | _`12-20.04_beta` &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1008+ | _**`14-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | Postgres 14 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1009+ | _`12-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | Postgres 12.4 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1010 | _`track_risk`_ |
1011
1012
1013diff --git a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
1014index e6d19b0..ba93f08 100644
1015--- a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
1016+++ b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md
1017@@ -1,5 +1,6 @@
1018 # Prometheus Alertmanager | Ubuntu
1019
1020+
1021 Current Prometheus Alertmanager Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus Alertmanager or Ubuntu release.
1022
1023 ## About Prometheus Alertmanager
1024@@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman
1025
1026 | Channel Tags | | | Currently | Architectures |
1027 |---|---|---|---|---|
1028- | **`0.23-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/prometheus-alertmanager) | [-](https://gallery.ecr.aws/lts/prometheus-alertmanager) | Prometheus Alertmanager 0.23 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1029+ | **`0.23-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/prometheus-alertmanager) | Prometheus Alertmanager 0.23 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1030 | _`track_risk`_ |
1031
1032
1033diff --git a/docs/public.ecr.aws/ubuntu/prometheus.md b/docs/public.ecr.aws/ubuntu/prometheus.md
1034index a5472a9..60cf2f2 100644
1035--- a/docs/public.ecr.aws/ubuntu/prometheus.md
1036+++ b/docs/public.ecr.aws/ubuntu/prometheus.md
1037@@ -1,5 +1,6 @@
1038 # Prometheus | Ubuntu
1039
1040+
1041 Current Prometheus Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus or Ubuntu release.
1042
1043 ## About Prometheus
1044@@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque
1045
1046 | Channel Tags | | | Currently | Architectures |
1047 |---|---|---|---|---|
1048- | **`2.33-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/prometheus) | [-](https://gallery.ecr.aws/lts/prometheus) | Prometheus 2.33 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1049+ | **`2.33-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/prometheus) | Prometheus 2.33 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1050 | _`track_risk`_ |
1051
1052
1053diff --git a/docs/public.ecr.aws/ubuntu/redis.md b/docs/public.ecr.aws/ubuntu/redis.md
1054index dbc7a40..4f3546b 100644
1055--- a/docs/public.ecr.aws/ubuntu/redis.md
1056+++ b/docs/public.ecr.aws/ubuntu/redis.md
1057@@ -1,5 +1,6 @@
1058 # Redis™ software | Ubuntu
1059
1060+
1061 Current Redis™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Redis™ software or Ubuntu release.
1062
1063 ## About Redis™ software
1064@@ -16,8 +17,8 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac
1065
1066 | Channel Tags | | | Currently | Architectures |
1067 |---|---|---|---|---|
1068- | **`6.2-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/redis) | [-](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1069- | `6.0-21.10_beta` &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/redis) | [-](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.0.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
1070+ | **`6.2-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1071+ | `6.0-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.0.15 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
1072 | _`track_risk`_ |
1073
1074
1075diff --git a/docs/public.ecr.aws/ubuntu/squid.md b/docs/public.ecr.aws/ubuntu/squid.md
1076index 1a69573..85facfa 100644
1077--- a/docs/public.ecr.aws/ubuntu/squid.md
1078+++ b/docs/public.ecr.aws/ubuntu/squid.md
1079@@ -1,5 +1,6 @@
1080 # Squid | Ubuntu
1081
1082+
1083 Current Squid Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Squid or Ubuntu release.
1084 For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/squid](https://gallery.ecr.aws/lts/squid).
1085
1086@@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/squid`. [Request ac
1087
1088 | Channel Tags | | | Currently | Architectures |
1089 |---|---|---|---|---|
1090- | **`5.2-22.04_beta`** &nbsp;&nbsp; | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1091- | `4.13-21.10_beta` &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/squid) | [-](https://gallery.ecr.aws/lts/squid) | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
1092+ | **`5.2-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1093+ | `4.13-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/squid) | Squid 4.13 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
1094 | _`track_risk`_ |
1095
1096-_The following tags might not be available in public.ecr.aws/ubuntu/squid but are shown here for completeness:_
1097+_The following tags might not be available in public.ecr.aws/ubuntu/squid, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
1098
1099 | Channel Tags | | | Currently | Architectures |
1100 |---|---|---|---|---|
1101- | _**`5.2-22.04_beta`** &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1102- | _`4.10-20.04_beta` &nbsp;&nbsp;_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1103+ | _**`5.2-22.04_beta`**_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | Squid 5.2 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1104+ | _`4.10-20.04_beta`_ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | Squid 4.10 on Ubuntu&nbsp;20.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1105 | _`track_risk`_ |
1106
1107
1108diff --git a/docs/public.ecr.aws/ubuntu/telegraf.md b/docs/public.ecr.aws/ubuntu/telegraf.md
1109index adc8ddd..e266159 100644
1110--- a/docs/public.ecr.aws/ubuntu/telegraf.md
1111+++ b/docs/public.ecr.aws/ubuntu/telegraf.md
1112@@ -1,5 +1,6 @@
1113 # Telegraf™ software | Ubuntu
1114
1115+
1116 Current Telegraf™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Telegraf™ software or Ubuntu release.
1117
1118 ## About Telegraf™ software
1119@@ -16,8 +17,8 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request
1120
1121 | Channel Tags | | | Currently | Architectures |
1122 |---|---|---|---|---|
1123- | **`1.21-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/telegraf) | [-](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.21 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1124- | `1.19-21.10_beta` &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/telegraf) | [-](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.19.2 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
1125+ | **`1.21-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.21 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1126+ | `1.19-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.19.2 on Ubuntu&nbsp;21.10&nbsp; | `amd64`, `arm64`, `ppc64el`, `s390x` |
1127 | _`track_risk`_ |
1128
1129
1130diff --git a/docs/public.ecr.aws/ubuntu/ubuntu.md b/docs/public.ecr.aws/ubuntu/ubuntu.md
1131new file mode 100644
1132index 0000000..c4e9c01
1133--- /dev/null
1134+++ b/docs/public.ecr.aws/ubuntu/ubuntu.md
1135@@ -0,0 +1,56 @@
1136+# Ubuntu
1137+
1138+The Ubuntu container image maintained by Canonical. Receives security updates and rolls to a new version [every six months](https://ubuntu.com/about/release-cycle).
1139+For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/ubuntu](https://gallery.ecr.aws/lts/ubuntu).
1140+
1141+## About Ubuntu
1142+
1143+![Ubuntu](https://assets.ubuntu.com/v1/adac6928-ubuntu.svg)
1144+
1145+Ubuntu is a Debian-based Linux operating system that runs from the desktop to the cloud, to all your internet connected things. It is the world's most popular operating system across public clouds and OpenStack clouds. It is the number one platform for containers; from Docker to Kubernetes to LXD, Ubuntu can run your containers at scale. Fast, secure and simple, Ubuntu powers millions of PCs worldwide. Read more on the [Ubuntu website](https://ubuntu.com/).
1146+
1147+
1148+## Tags and Architectures
1149+![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)
1150+Up to 5 years free security maintenance [from public.ecr.aws/lts/ubuntu](https://gallery.ecr.aws/lts/ubuntu).
1151+
1152+![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)
1153+Up to 10 years customer security maintenance `from canonical/ubuntu`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
1154+
1155+| Channel Tags | | | | Currently | Architectures |
1156+|---|---|---|---|---|---|
1157+ | **`22.10_stable`** | **`22.10`, `22.10_beta`, `22.10_candidate`, `22.10_edge`, `22.10_stable`, `kinetic`, `kinetic-22.10_edge`, `latest`** | - | [-](https://gallery.ecr.aws/lts/ubuntu) | Ubuntu 22.10 "Kinetic Kudu" | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` |
1158+ | `22.04_stable` | `22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `22.04_stable`, `jammy`, `jammy-22.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2027 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
1159+ | `20.04_stable` | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `20.04_stable`, `focal`, `focal-20.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2025 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2030 | Ubuntu 20.04 LTS "Focal Fossa" | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` |
1160+ | `18.04_stable` | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `18.04_stable`, `bionic`, `bionic-18.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2023 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver" | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` |
1161+ | `23.04_edge` | `23.04`, `23.04_edge`, `edge`, `lunar`, `lunar-23.04_edge` | - | [-](https://gallery.ecr.aws/lts/ubuntu) | Ubuntu 23.04 "Lunar Lobster" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
1162+| _`track_risk`_ |
1163+
1164+_The following tags might not be available in public.ecr.aws/ubuntu/ubuntu, but are available in Canonical's LTS or ESM channels. They are shown here for completeness:_
1165+
1166+| Channel Tags | | | | Currently | Architectures |
1167+|---|---|---|---|---|---|
1168+ | _**`22.04_stable`**_ | **`22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `22.04_stable`, `jammy`, `jammy-22.04_edge`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2027 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` |
1169+ | _`20.04_stable`_ | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `20.04_stable`, `focal`, `focal-20.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2025 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2030 | Ubuntu 20.04 LTS "Focal Fossa" | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` |
1170+ | _`18.04_stable`_ | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `18.04_stable`, `bionic`, `bionic-18.04_edge` | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2023 | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/ubuntu) until 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver" | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` |
1171+| _`16.04_stable`_ &nbsp;&nbsp; | | - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
1172+| _`14.04_stable`_ &nbsp;&nbsp; | | - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
1173+| _`track_risk`_ |
1174+
1175+
1176+Channel Tags 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`.
1177+
1178+
1179+### Commercial use and Extended Security Maintenance channels
1180+If your usage includes commercial redistribution, or requires ESM or unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com).
1181+
1182+## Deprecated channels & tags
1183+These channels (tags) are not updated anymore. Please upgrade to newer channels, or [reach out](https://ubuntu.com/security/docker-images#get-in-touch) if you can't upgrade.
1184+
1185+| Track | Version | EOL | Upgrade Path |
1186+|---|---|---|---|
1187+ | ~~21.10-~~ | Ubuntu 21.10 "Impish Indri" | 07/2022 | 22.04_stable |
1188+ | ~~21.04-~~ | Ubuntu 21.04 "Hirsute Hippo" | 01/2022 | ~~21.10~~ |
1189+ | ~~20.10-~~ | Ubuntu 20.10 "Groovy Gorilla" | 07/2021 | ~~21.04~~ |
1190+| _`track`_ |
1191+
1192diff --git a/docs/public.ecr.aws/ubuntu/usage/ubuntu.md b/docs/public.ecr.aws/ubuntu/usage/ubuntu.md
1193new file mode 100644
1194index 0000000..a67dcae
1195--- /dev/null
1196+++ b/docs/public.ecr.aws/ubuntu/usage/ubuntu.md
1197@@ -0,0 +1,45 @@
1198+
1199+
1200+
1201+
1202+
1203+
1204+
1205+## Docker CLI
1206+
1207+Launch this image locally:
1208+
1209+```sh
1210+docker run -d --name ubuntu-container -e TZ=UTC public.ecr.aws/ubuntu/ubuntu:22.04_stable
1211+```
1212+
1213+
1214+#### Testing/Debugging
1215+
1216+To debug the container:
1217+
1218+```sh
1219+docker logs -f ubuntu-container
1220+```
1221+
1222+To get an interactive shell:
1223+
1224+```sh
1225+docker exec -it ubuntu-container /bin/bash
1226+```
1227+
1228+
1229+
1230+## Bugs and feature requests
1231+
1232+If you find a bug in our image or want to request a specific feature, please file a bug here:
1233+
1234+[https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug)
1235+
1236+Please title the bug "`ubuntu: <issue summary>`". Make sure to include the digest of the image you are using, from:
1237+
1238+```sh
1239+docker images --no-trunc --quiet public.ecr.aws/ubuntu/ubuntu:<tag>
1240+```
1241+
1242+
1243diff --git a/docs/public.ecr.aws/ubuntu/zookeeper.md b/docs/public.ecr.aws/ubuntu/zookeeper.md
1244index 6286e8b..e33377c 100644
1245--- a/docs/public.ecr.aws/ubuntu/zookeeper.md
1246+++ b/docs/public.ecr.aws/ubuntu/zookeeper.md
1247@@ -1,5 +1,6 @@
1248 # Apache ZooKeeper | Ubuntu
1249
1250+
1251 Current Apache ZooKeeper Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache ZooKeeper or Ubuntu release.
1252
1253 ## About Apache ZooKeeper
1254@@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/zookeeper`. [Reques
1255
1256 | Channel Tags | | | Currently | Architectures |
1257 |---|---|---|---|---|
1258- | **`3.1-22.04_beta`** &nbsp;&nbsp; | [-](https://gallery.ecr.aws/lts/zookeeper) | [-](https://gallery.ecr.aws/lts/zookeeper) | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1259+ | **`3.1-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/zookeeper) | Apache ZooKeeper 3.1.0 on Ubuntu&nbsp;22.04&nbsp;LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
1260 | _`track_risk`_ |
1261
1262
1263diff --git a/templates/README_DOCKERHUB.md b/templates/README_DOCKERHUB.md
1264index a53245c..56dc52b 100644
1265--- a/templates/README_DOCKERHUB.md
1266+++ b/templates/README_DOCKERHUB.md
1267@@ -9,6 +9,9 @@
1268 <%
1269 baserepo='ubuntu'
1270 tag='latest'
1271+ has_tag_aliases=list(map(lambda r: len(r.get('tags', [])) > 1, releases))
1272+ tags_column_header=' foo | | ' if any(has_tag_aliases) else ' | '
1273+ tags_column_separator='|---|---' if any(has_tag_aliases) else '|---'
1274 risks=['stable', 'candidate', 'beta', 'edge']
1275 sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])))
1276 filterfn=lambda release : 'deprecated' not in release
1277@@ -24,15 +27,15 @@
1278 LTS releases every 2 years with a 5-year free security updates period. The Extended Security Maintenance (ESM) program provides up to 10-year security updates.
1279 [Read more](https://ubuntu.com/about/release-cycle).
1280
1281-This repository is maintained by the Canonical team and receives security updates quicker than the [ubuntu](https://hub.docker.com/_/ubuntu) image from the Docker Official Images library. Both are fine to use; however, please be sure to use this repository if you applied for [commercial support](https://ubuntu.com/security/docker-images#get-in-touch). **This repository is free to use and exempted from per-user rate limits.**
1282+This repository is maintained by the Canonical team and receives security updates quicker than the [Ubuntu](https://hub.docker.com/_/ubuntu) image from the Docker Official Images library. Both are fine to use; however, please be sure to use this repository if you applied for [commercial support](https://ubuntu.com/security/docker-images#get-in-touch). **This repository is free to use and exempted from per-user rate limits.**
1283 % else:
1284 Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer ${application} or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.**
1285 % endif
1286
1287 <%include file="header.md" args="baserepo=baserepo, **locals()['pageargs']"/>
1288
1289-| Channel Tags | | | Currently | Architectures |
1290-|---|---|---|---|---|
1291+| Channel Tags |${tags_column_header}| Currently | Architectures |
1292+${tags_column_separator}|---|---|---|---|
1293 % for i, release in enumerate(current_releases):
1294 <%
1295 first=i==0
1296@@ -45,13 +48,18 @@ Current ${application} Docker Image [from Canonical](https://ubuntu.com/security
1297 version=str(release['version']) if 'version' in release else track
1298 architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures']))
1299 swver='.'.join(track.split(".")[:2])
1300- auto_tags=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', [])))
1301 basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk
1302- thistag='`'+basetag+'`' if not auto_tags else auto_tags
1303- usage_tag=basetag if not auto_tags else str(release.get('tags', ['latest'])[0])
1304- tags='**'+thistag+'**' if first else thistag
1305+ all_tags=release.get('tags', [])
1306+ all_tags.sort()
1307+ all_tags = list(filter(lambda x: x != basetag, all_tags))
1308+ tag_aliases=", ".join(map(lambda x: "`"+str(x)+"`", all_tags))
1309+ channel_tag='**`'+basetag+'`**' if first else '`'+basetag+'`'
1310+ oci_tags='`'+basetag+'`' if not tag_aliases else tag_aliases
1311+ usage_tag=basetag if not tag_aliases else str(release.get('tags', ['latest'])[0])
1312+ tags='**'+oci_tags+'**' if first else oci_tags
1313 first_lts_tag=basetag if type == 'LTS' and not first_lts_tag else first_lts_tag
1314-%> | ${tags} &nbsp;&nbsp; | ${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if type == 'LTS' else '-'} ${'<br>until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | ${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else '-'} <br> ${'<br>until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
1315+ auto_tags_column=channel_tag+' | '+tags if any(has_tag_aliases) else channel_tag
1316+%> | ${auto_tags_column} | ${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if type == 'LTS' else '-'} ${'<br>until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | ${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else '-'} ${'<br>until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
1317 % endfor
1318 | _`track_risk`_ |
1319
1320diff --git a/templates/README_ECR.md b/templates/README_ECR.md
1321index 802b7c5..1decd01 100644
1322--- a/templates/README_ECR.md
1323+++ b/templates/README_ECR.md
1324@@ -9,6 +9,9 @@
1325 <%
1326 baserepo='public.ecr.aws/ubuntu'
1327 tag='latest'
1328+ has_tag_aliases=list(map(lambda r: len(r.get('tags', [])) > 1, releases))
1329+ tags_column_header=' | | ' if any(has_tag_aliases) else ' | '
1330+ tags_column_separator='|---|---' if any(has_tag_aliases) else '|---'
1331 risks=['stable', 'candidate', 'beta', 'edge']
1332 sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])) )
1333 filtercurrentfn=lambda release : 'deprecated' not in release
1334@@ -17,12 +20,14 @@
1335 current_releases=list(filter(filtercurrentfn, releases))
1336 lts_releases=list(filter(filterltsfn, current_releases))
1337 old_releases=[release for release in releases if release not in current_releases]
1338- current_releases=[current_releases.pop(0)]+[release for release in current_releases if release not in lts_releases]
1339 has_an_lts=len(lts_releases)>0
1340 %>
1341 % if application=="Ubuntu":
1342 The Ubuntu container image maintained by Canonical. Receives security updates and rolls to a new version [every six months](https://ubuntu.com/about/release-cycle).
1343 % else:
1344+<%
1345+ current_releases=[current_releases.pop(0)]+[release for release in current_releases if release not in lts_releases]
1346+%>
1347 Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer ${application} or Ubuntu release.
1348 % endif
1349 % if has_an_lts:
1350@@ -41,8 +46,8 @@ Up to 5 years free security maintenance${' [from public.ecr.aws/lts/'+repo+'](ht
1351 Up to 10 years customer security maintenance `from canonical/${repo}`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch).
1352 % for k, list_releases in enumerate([current_releases, lts_releases] if has_an_lts else [current_releases]):
1353
1354-| Channel Tags | | | Currently | Architectures |
1355-|---|---|---|---|---|
1356+| Channel Tags |${tags_column_header}| Currently | Architectures |
1357+${tags_column_separator}|---|---|---|---|
1358 % for i, release in enumerate(list_releases):
1359 <%
1360 first=i==0
1361@@ -57,19 +62,25 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request
1362 version=str(release['version']) if 'version' in release else track
1363 architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures']))
1364 swver='.'.join(track.split(".")[:2])
1365- auto_tags=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', [])))
1366 basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk
1367- thistag='`'+basetag+'`' if not auto_tags else auto_tags
1368- tags='**'+thistag+'**' if first else thistag
1369-%> | ${'_' if type == 'LTS' and k != 0 else ''}${tags} &nbsp;&nbsp;${'_' if type == 'LTS' and k != 0 else ''} | [${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | [${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
1370+ all_tags=release.get('tags', [])
1371+ all_tags.sort()
1372+ all_tags = list(filter(lambda x: x != basetag, all_tags))
1373+ tag_aliases=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', [])))
1374+ oci_tags='`'+basetag+'`' if not tag_aliases else tag_aliases
1375+ channel_tag='**`'+basetag+'`**' if first else '`'+basetag+'`'
1376+ channel_tag='_'+channel_tag+'_' if type == 'LTS' and k != 0 else channel_tag
1377+ tags='**'+oci_tags+'**' if first else oci_tags
1378+ auto_tags_column=channel_tag+' | '+tags if any(has_tag_aliases) else channel_tag
1379+%> | ${auto_tags_column} | ${'[![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/'+repo+')' if type == 'LTS' else '-'} ${'until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | [${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
1380 % endfor
1381 % if application == "Ubuntu" and k == 1:
1382-| _`16.04_stable`_ &nbsp;&nbsp; | - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
1383-| _`14.04_stable`_ &nbsp;&nbsp; | - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
1384+| _`16.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
1385+| _`14.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
1386 % endif
1387 | _`track_risk`_ |
1388
1389-${'_The following tags might not be available in '+baserepo+'/'+repo+' but are shown here for completeness:_' if k==0 and has_an_lts else ''}
1390+${'_The following tags might not be available in '+baserepo+'/'+repo+', but are available in Canonical\'s LTS or ESM channels. They are shown here for completeness:_' if k==0 and has_an_lts else ''}
1391 % endfor
1392 <%include file="channels_message.md" />
1393
1394diff --git a/templates/README_ECR_LTS.md b/templates/README_ECR_LTS.md
1395index 9c8b9db..68fea04 100644
1396--- a/templates/README_ECR_LTS.md
1397+++ b/templates/README_ECR_LTS.md
1398@@ -9,6 +9,9 @@
1399 <%
1400 baserepo='public.ecr.aws/lts'
1401 tag='latest'
1402+ has_tag_aliases=list(map(lambda r: len(r.get('tags', [])) > 1, releases))
1403+ tags_column_header=' | | ' if any(has_tag_aliases) else ' | '
1404+ tags_column_separator='|---|---' if any(has_tag_aliases) else '|---'
1405 risks=['stable', 'candidate', 'beta', 'edge']
1406 sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])) )
1407 filterltsfn=lambda release : release['type'] == 'LTS' or release['type'] == 'ESM' if 'type' in release else False
1408@@ -33,8 +36,8 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request
1409
1410 <!-- _Tags in italics are not available in ${baserepo}/${repo} but are shown here for completeness._ -->
1411
1412-| Channel Tags | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
1413-|---|---|---|---|---|
1414+| Channel Tags ${tags_column_header} ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
1415+${tags_column_separator}|---|---|---|---|
1416 % for i, release in enumerate(lts_releases):
1417 <%
1418 first=i==0
1419@@ -49,8 +52,15 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request
1420 version=str(release['version']) if 'version' in release else track
1421 architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures']))
1422 swver='.'.join(track.split(".")[:2])
1423- thistag=swver+'-'+base+'_'+''+risk
1424- tag=thistag if first else tag
1425+ thistag=swver+'-'+base+'_'+''+risk if application != 'Ubuntu' else swver+'_'+risk
1426+ all_tags=release.get('tags', [])
1427+ all_tags.sort()
1428+ all_tags = list(filter(lambda x: x != thistag, all_tags))
1429+ tag_aliases=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', [])))
1430+ oci_tags='`'+thistag+'`' if not tag_aliases else tag_aliases
1431+ channel_tag='**`'+thistag+'`**' if first else '`'+thistag+'`'
1432+ tags='**'+oci_tags+'**' if first else oci_tags
1433+ auto_tags_column=channel_tag+' | '+tags if any(has_tag_aliases) else channel_tag
1434 has_an_lts=(has_an_lts or type == 'LTS' or type == 'ESM')
1435 sos_year=2000+int(base.split(".")[0])
1436 eol_year=sos_year+5
1437@@ -59,7 +69,7 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request
1438 eoe_date=base.split(".")[1]+'/'+str(eoe_year) if not support.get('esm_until') else support['esm_until']
1439 eol=eol_date if basetype == 'LTS' else '-'
1440 eoe=eoe_date if basetype == 'LTS' or basetype == 'ESM' else '-'
1441-%> | ${'**`'+thistag+'`**' if first else '`'+thistag+'`'} &nbsp;&nbsp; | ${eol} | ${eoe} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
1442+%> | ${auto_tags_column} | ${eol} | ${eoe} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
1443 % endfor
1444 | _`track_risk`_ |
1445
1446diff --git a/templates/ubuntu.yaml b/templates/ubuntu.yaml
1447index 9a87b33..f71e6e6 100644
1448--- a/templates/ubuntu.yaml
1449+++ b/templates/ubuntu.yaml
1450@@ -4,7 +4,7 @@ description: >
1451 ![Ubuntu](https://assets.ubuntu.com/v1/adac6928-ubuntu.svg)
1452
1453
1454- Ubuntu is a Debian-based Linux operating system that runs from the desktop to the cloud, to all your internet connected things. It is the world's most popular operating system across public clouds and OpenStack clouds. It is the number one platform for containers; from Docker to Kubernetes to LXD, Ubuntu can run your containers at scale. Fast, secure and simple, Ubuntu powers millions of PCs worldwide. Read more on the [ubuntu website](https://ubuntu.com/).
1455+ Ubuntu is a Debian-based Linux operating system that runs from the desktop to the cloud, to all your internet connected things. It is the world's most popular operating system across public clouds and OpenStack clouds. It is the number one platform for containers; from Docker to Kubernetes to LXD, Ubuntu can run your containers at scale. Fast, secure and simple, Ubuntu powers millions of PCs worldwide. Read more on the [Ubuntu website](https://ubuntu.com/).
1456 docker:
1457 parameters:
1458 debug:

Subscribers

People subscribed via source and target branches