Merge ~cjdc/ubuntu-docker-images/+git/templates:fix-ubuntu-docs into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main
- Git
- lp:~cjdc/ubuntu-docker-images/+git/templates
- fix-ubuntu-docs
- Merge into 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) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tomáš Virtus | Approve | ||
| Valentin Viennot (community) | Approve | ||
| Ubuntu Docker Images | Pending | ||
|
Review via email:
|
|||
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
Description of the change
To post a comment you must log in.
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
| 1 | diff --git a/.gitignore b/.gitignore | |||
| 2 | index c7c6720..7f8a775 100644 | |||
| 3 | --- a/.gitignore | |||
| 4 | +++ b/.gitignore | |||
| 5 | @@ -1,4 +1,5 @@ | |||
| 6 | 1 | .env | 1 | .env |
| 7 | 2 | .vscode | ||
| 8 | 2 | *.swp | 3 | *.swp |
| 9 | 3 | RenderDown/ | 4 | RenderDown/ |
| 10 | 4 | __pycache__ | 5 | __pycache__ |
| 11 | diff --git a/docs/docker.io/ubuntu/apache2.md b/docs/docker.io/ubuntu/apache2.md | |||
| 12 | index 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 | 18 | 18 | ||
| 17 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 18 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 22 | 21 | | **`2.4-22.04_beta`** |  |  <br> | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`2.4-22.04_beta`** |  |  | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 23 | 22 | | `2.4-21.10_beta` | - | - <br> | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `2.4-21.10_beta` | - | - | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 24 | 23 | | `2.4-20.04_beta` |  |  <br> | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | `2.4-20.04_beta` |  |  | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 25 | 24 | | _`track_risk`_ | | 24 | | _`track_risk`_ | |
| 26 | 25 | 25 | ||
| 27 | 26 | 26 | ||
| 28 | diff --git a/docs/docker.io/ubuntu/bind9.md b/docs/docker.io/ubuntu/bind9.md | |||
| 29 | index 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 | 18 | 18 | ||
| 34 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 35 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 39 | 21 | | **`9.18-22.04_beta`** |  |  <br> | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`9.18-22.04_beta`** |  |  | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 40 | 22 | | `9.16-21.10_beta` | - | - <br> | Bind9 9.16.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `9.16-21.10_beta` | - | - | Bind9 9.16.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 41 | 23 | | `9.16-20.04_beta` |  |  <br> | Bind9 9.16.1 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | `9.16-20.04_beta` |  |  | Bind9 9.16.1 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 42 | 24 | | _`track_risk`_ | | 24 | | _`track_risk`_ | |
| 43 | 25 | 25 | ||
| 44 | 26 | 26 | ||
| 45 | diff --git a/docs/docker.io/ubuntu/cassandra.md b/docs/docker.io/ubuntu/cassandra.md | |||
| 46 | index 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 | 29 | 29 | ||
| 51 | 30 | | Channel Tags | | | Currently | Architectures | | 30 | | Channel Tags | | | Currently | Architectures | |
| 52 | 31 | |---|---|---|---|---| | 31 | |---|---|---|---|---| |
| 54 | 32 | | **`4.0-22.04_beta`** | - | - <br> | Apache Cassandra 4.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 32 | | **`4.0-22.04_beta`** | - | - | Apache Cassandra 4.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 55 | 33 | | _`track_risk`_ | | 33 | | _`track_risk`_ | |
| 56 | 34 | 34 | ||
| 57 | 35 | 35 | ||
| 58 | diff --git a/docs/docker.io/ubuntu/cortex.md b/docs/docker.io/ubuntu/cortex.md | |||
| 59 | index 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 | 25 | 25 | ||
| 64 | 26 | | Channel Tags | | | Currently | Architectures | | 26 | | Channel Tags | | | Currently | Architectures | |
| 65 | 27 | |---|---|---|---|---| | 27 | |---|---|---|---|---| |
| 67 | 28 | | **`1.11-22.04_beta`** | - | - <br> | Cortex 1.11 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 28 | | **`1.11-22.04_beta`** | - | - | Cortex 1.11 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 68 | 29 | | _`track_risk`_ | | 29 | | _`track_risk`_ | |
| 69 | 30 | 30 | ||
| 70 | 31 | 31 | ||
| 71 | diff --git a/docs/docker.io/ubuntu/grafana.md b/docs/docker.io/ubuntu/grafana.md | |||
| 72 | index 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 | 18 | 18 | ||
| 77 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 78 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 80 | 21 | | **`8.2-22.04_beta`** | - | - <br> | Grafana™ software 8.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`8.2-22.04_beta`** | - | - | Grafana™ software 8.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 81 | 22 | | _`track_risk`_ | | 22 | | _`track_risk`_ | |
| 82 | 23 | 23 | ||
| 83 | 24 | 24 | ||
| 84 | diff --git a/docs/docker.io/ubuntu/kafka.md b/docs/docker.io/ubuntu/kafka.md | |||
| 85 | index 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 | 18 | 18 | ||
| 90 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 91 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 93 | 21 | | **`3.1-22.04_beta`** | - | - <br> | Apache Kafka 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`3.1-22.04_beta`** | - | - | Apache Kafka 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 94 | 22 | | _`track_risk`_ | | 22 | | _`track_risk`_ | |
| 95 | 23 | 23 | ||
| 96 | 24 | 24 | ||
| 97 | diff --git a/docs/docker.io/ubuntu/loki.md b/docs/docker.io/ubuntu/loki.md | |||
| 98 | index 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 | 18 | 18 | ||
| 103 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 104 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 106 | 21 | | **`2.4-22.04_beta`** | - | - <br> | Grafana Loki™ software 2.4.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`2.4-22.04_beta`** | - | - | Grafana Loki™ software 2.4.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 107 | 22 | | _`track_risk`_ | | 22 | | _`track_risk`_ | |
| 108 | 23 | 23 | ||
| 109 | 24 | 24 | ||
| 110 | diff --git a/docs/docker.io/ubuntu/memcached.md b/docs/docker.io/ubuntu/memcached.md | |||
| 111 | index 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 | 18 | 18 | ||
| 116 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 117 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 121 | 21 | | **`1.6-22.04_beta`** | - | - <br> | Memcached 1.6 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`1.6-22.04_beta`** | - | - | Memcached 1.6 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 122 | 22 | | `1.6-21.10_beta` | - | - <br> | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `1.6-21.10_beta` | - | - | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 123 | 23 | | `1.5-20.04_beta` |  |  <br> | Memcached 1.5.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | `1.5-20.04_beta` |  |  | Memcached 1.5.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 124 | 24 | | _`track_risk`_ | | 24 | | _`track_risk`_ | |
| 125 | 25 | 25 | ||
| 126 | 26 | 26 | ||
| 127 | diff --git a/docs/docker.io/ubuntu/mysql.md b/docs/docker.io/ubuntu/mysql.md | |||
| 128 | index 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 | 18 | 18 | ||
| 133 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 134 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 138 | 21 | | **`8.0-22.04_beta`** |  |  <br> | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`8.0-22.04_beta`** |  |  | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 139 | 22 | | `8.0-21.10_beta` | - | - <br> | MySQL™ software 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `8.0-21.10_beta` | - | - | MySQL™ software 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 140 | 23 | | `8.0-20.04_beta` |  |  <br> | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | `8.0-20.04_beta` |  |  | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 141 | 24 | | _`track_risk`_ | | 24 | | _`track_risk`_ | |
| 142 | 25 | 25 | ||
| 143 | 26 | 26 | ||
| 144 | diff --git a/docs/docker.io/ubuntu/nginx.md b/docs/docker.io/ubuntu/nginx.md | |||
| 145 | index 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 | 18 | 18 | ||
| 150 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 151 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 155 | 21 | | **`1.18-22.04_beta`** |  |  <br> | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`1.18-22.04_beta`** |  |  | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 156 | 22 | | `1.18-21.10_beta` | - | - <br> | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `1.18-21.10_beta` | - | - | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 157 | 23 | | `1.18-20.04_beta` |  |  <br> | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | `1.18-20.04_beta` |  |  | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 158 | 24 | | _`track_risk`_ | | 24 | | _`track_risk`_ | |
| 159 | 25 | 25 | ||
| 160 | 26 | 26 | ||
| 161 | diff --git a/docs/docker.io/ubuntu/postgres.md b/docs/docker.io/ubuntu/postgres.md | |||
| 162 | index 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 | 18 | 18 | ||
| 167 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 168 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 172 | 21 | | **`14-22.04_beta`** |  |  <br> | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`14-22.04_beta`** |  |  | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 173 | 22 | | `13-21.10_beta` | - | - <br> | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `13-21.10_beta` | - | - | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 174 | 23 | | `12-20.04_beta` |  |  <br> | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | `12-20.04_beta` |  |  | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 175 | 24 | | _`track_risk`_ | | 24 | | _`track_risk`_ | |
| 176 | 25 | 25 | ||
| 177 | 26 | 26 | ||
| 178 | diff --git a/docs/docker.io/ubuntu/prometheus-alertmanager.md b/docs/docker.io/ubuntu/prometheus-alertmanager.md | |||
| 179 | index 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 | 18 | 18 | ||
| 184 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 185 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 187 | 21 | | **`0.23-22.04_beta`** | - | - <br> | Prometheus Alertmanager 0.23 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`0.23-22.04_beta`** | - | - | Prometheus Alertmanager 0.23 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 188 | 22 | | _`track_risk`_ | | 22 | | _`track_risk`_ | |
| 189 | 23 | 23 | ||
| 190 | 24 | 24 | ||
| 191 | diff --git a/docs/docker.io/ubuntu/prometheus.md b/docs/docker.io/ubuntu/prometheus.md | |||
| 192 | index 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 | 18 | 18 | ||
| 197 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 198 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 200 | 21 | | **`2.33-22.04_beta`** | - | - <br> | Prometheus 2.33 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`2.33-22.04_beta`** | - | - | Prometheus 2.33 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 201 | 22 | | _`track_risk`_ | | 22 | | _`track_risk`_ | |
| 202 | 23 | 23 | ||
| 203 | 24 | 24 | ||
| 204 | diff --git a/docs/docker.io/ubuntu/redis.md b/docs/docker.io/ubuntu/redis.md | |||
| 205 | index 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 | 18 | 18 | ||
| 210 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 211 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 214 | 21 | | **`6.2-22.04_beta`** | - | - <br> | Redis™ software 6.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`6.2-22.04_beta`** | - | - | Redis™ software 6.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 215 | 22 | | `6.0-21.10_beta` | - | - <br> | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `6.0-21.10_beta` | - | - | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 216 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 217 | 24 | 24 | ||
| 218 | 25 | 25 | ||
| 219 | diff --git a/docs/docker.io/ubuntu/squid.md b/docs/docker.io/ubuntu/squid.md | |||
| 220 | index 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 | 18 | 18 | ||
| 225 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 226 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 230 | 21 | | **`5.2-22.04_beta`** |  |  <br> | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`5.2-22.04_beta`** |  |  | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 231 | 22 | | `4.13-21.10_beta` | - | - <br> | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `4.13-21.10_beta` | - | - | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 232 | 23 | | `4.10-20.04_beta` |  |  <br> | Squid 4.10 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | `4.10-20.04_beta` |  |  | Squid 4.10 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 233 | 24 | | _`track_risk`_ | | 24 | | _`track_risk`_ | |
| 234 | 25 | 25 | ||
| 235 | 26 | 26 | ||
| 236 | diff --git a/docs/docker.io/ubuntu/telegraf.md b/docs/docker.io/ubuntu/telegraf.md | |||
| 237 | index 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 | 18 | 18 | ||
| 242 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 243 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 246 | 21 | | **`1.21-22.04_beta`** | - | - <br> | Telegraf™ software 1.21 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`1.21-22.04_beta`** | - | - | Telegraf™ software 1.21 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 247 | 22 | | `1.19-21.10_beta` | - | - <br> | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `1.19-21.10_beta` | - | - | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 248 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 249 | 24 | 24 | ||
| 250 | 25 | 25 | ||
| 251 | diff --git a/docs/docker.io/ubuntu/ubuntu.md b/docs/docker.io/ubuntu/ubuntu.md | |||
| 252 | 26 | new file mode 100644 | 26 | new file mode 100644 |
| 253 | index 0000000..d46be3d | |||
| 254 | --- /dev/null | |||
| 255 | +++ b/docs/docker.io/ubuntu/ubuntu.md | |||
| 256 | @@ -0,0 +1,102 @@ | |||
| 257 | 1 | # Ubuntu | ||
| 258 | 2 | |||
| 259 | 3 | **The Ubuntu container image maintained by Canonical.** Receives fast security updates, and rolls to a new version every six months. | ||
| 260 | 4 | 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 | 5 | [Read more](https://ubuntu.com/about/release-cycle). | ||
| 262 | 6 | |||
| 263 | 7 | 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 | 8 | |||
| 265 | 9 | |||
| 266 | 10 | ## About Ubuntu | ||
| 267 | 11 | |||
| 268 | 12 |  | ||
| 269 | 13 | |||
| 270 | 14 | 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 | 15 | |||
| 272 | 16 | ## LTS Docker Image Portfolio | ||
| 273 | 17 | 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 | 18 | |||
| 275 | 19 | ## Tags and Architectures | ||
| 276 | 20 |  | ||
| 277 | 21 | Up to 5 years free security maintenance on LTS channels. | ||
| 278 | 22 | |||
| 279 | 23 |  | ||
| 280 | 24 | Up to 10 years customer security maintenance [from Canonical's restricted repositories](https://ubuntu.com/security/docker-images#get-in-touch). | ||
| 281 | 25 | |||
| 282 | 26 | |||
| 283 | 27 | | Channel Tags | foo | | | Currently | Architectures | | ||
| 284 | 28 | |---|---|---|---|---|---| | ||
| 285 | 29 | | **`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 | 30 | | `22.04_stable` | `22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `jammy`, `jammy-22.04_edge` |  <br>until 04/2027 |  <br>until 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` | | ||
| 287 | 31 | | `20.04_stable` | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `focal`, `focal-20.04_edge` |  <br>until 04/2025 |  <br>until 04/2030 | Ubuntu 20.04 LTS "Focal Fossa" | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` | | ||
| 288 | 32 | | `18.04_stable` | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `bionic`, `bionic-18.04_edge` |  <br>until 04/2023 |  <br>until 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver" | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` | | ||
| 289 | 33 | | `23.04_edge` | `23.04`, `edge`, `lunar`, `lunar-23.04_edge` | - | - | Ubuntu 23.04 "Lunar Lobster" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` | | ||
| 290 | 34 | | _`track_risk`_ | | ||
| 291 | 35 | |||
| 292 | 36 | _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 | 37 | |||
| 294 | 38 | | Channel Tag |  until |  until | Currently | Architectures | | ||
| 295 | 39 | |---|---|---|---|---| | ||
| 296 | 40 | | _`16.04_stable`_ | - | 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` | | ||
| 297 | 41 | | _`14.04_stable`_ | - | 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`| | ||
| 298 | 42 | | _`track_risk`_ | | ||
| 299 | 43 | |||
| 300 | 44 | |||
| 301 | 45 | 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 | 46 | |||
| 303 | 47 | ### Commercial use and Extended Security Maintenance channels | ||
| 304 | 48 | 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 | 49 | |||
| 306 | 50 | ## Usage | ||
| 307 | 51 | |||
| 308 | 52 | Launch this image locally: | ||
| 309 | 53 | |||
| 310 | 54 | ```sh | ||
| 311 | 55 | docker run -d --name ubuntu-container -e TZ=UTC ubuntu/ubuntu:22.04_stable | ||
| 312 | 56 | ``` | ||
| 313 | 57 | |||
| 314 | 58 | |||
| 315 | 59 | #### Testing/Debugging | ||
| 316 | 60 | |||
| 317 | 61 | To debug the container: | ||
| 318 | 62 | |||
| 319 | 63 | ```sh | ||
| 320 | 64 | docker logs -f ubuntu-container | ||
| 321 | 65 | ``` | ||
| 322 | 66 | |||
| 323 | 67 | To get an interactive shell: | ||
| 324 | 68 | |||
| 325 | 69 | ```sh | ||
| 326 | 70 | docker exec -it ubuntu-container /bin/bash | ||
| 327 | 71 | ``` | ||
| 328 | 72 | |||
| 329 | 73 | |||
| 330 | 74 | |||
| 331 | 75 | ## Bugs and feature requests | ||
| 332 | 76 | |||
| 333 | 77 | If you find a bug in our image or want to request a specific feature, please file a bug here: | ||
| 334 | 78 | |||
| 335 | 79 | [https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug) | ||
| 336 | 80 | |||
| 337 | 81 | Please title the bug "`ubuntu: <issue summary>`". Make sure to include the digest of the image you are using, from: | ||
| 338 | 82 | |||
| 339 | 83 | ```sh | ||
| 340 | 84 | docker images --no-trunc --quiet ubuntu/ubuntu:<tag> | ||
| 341 | 85 | ``` | ||
| 342 | 86 | |||
| 343 | 87 | |||
| 344 | 88 | ## Deprecated channels & tags | ||
| 345 | 89 | 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 | 90 | |||
| 347 | 91 | | Track | Version | EOL | Upgrade Path | | ||
| 348 | 92 | |---|---|---|---| | ||
| 349 | 93 | | ~~21.10-~~ | Ubuntu 21.10 "Impish Indri" | 07/2022 | 22.04_stable | | ||
| 350 | 94 | | ~~21.04-~~ | Ubuntu 21.04 "Hirsute Hippo" | 01/2022 | ~~21.10~~ | | ||
| 351 | 95 | | _`track`_ | | ||
| 352 | 96 | |||
| 353 | 97 | ## Licensing | ||
| 354 | 98 | View [license information](https://www.ubuntu.com/about/about-ubuntu/licensing) for the software contained in this image. | ||
| 355 | 99 | |||
| 356 | 100 | 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 | 101 | |||
| 358 | 102 | |||
| 359 | diff --git a/docs/docker.io/ubuntu/zookeeper.md b/docs/docker.io/ubuntu/zookeeper.md | |||
| 360 | index 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 | 18 | 18 | ||
| 365 | 19 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 366 | 20 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 368 | 21 | | **`3.1-22.04_beta`** | - | - <br> | Apache ZooKeeper 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`3.1-22.04_beta`** | - | - | Apache ZooKeeper 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 369 | 22 | | _`track_risk`_ | | 22 | | _`track_risk`_ | |
| 370 | 23 | 23 | ||
| 371 | 24 | 24 | ||
| 372 | diff --git a/docs/public.ecr.aws/lts/apache2.md b/docs/public.ecr.aws/lts/apache2.md | |||
| 373 | index 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 | 18 | 18 | ||
| 378 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/apache2 but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/apache2 but are shown here for completeness._ --> |
| 379 | 20 | 20 | ||
| 381 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 382 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 385 | 23 | | **`2.4-22.04_beta`** | 04/2027 | 04/2032 | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | **`2.4-22.04_beta`** | 04/2027 | 04/2032 | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 386 | 24 | | `2.4-20.04_beta` | 04/2025 | 04/2030 | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 24 | | `2.4-20.04_beta` | 04/2025 | 04/2030 | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 387 | 25 | | _`track_risk`_ | | 25 | | _`track_risk`_ | |
| 388 | 26 | 26 | ||
| 389 | 27 | 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`. | 27 | 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`. |
| 390 | diff --git a/docs/public.ecr.aws/lts/bind9.md b/docs/public.ecr.aws/lts/bind9.md | |||
| 391 | index 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 | 18 | 18 | ||
| 396 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/bind9 but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/bind9 but are shown here for completeness._ --> |
| 397 | 20 | 20 | ||
| 399 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 400 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 403 | 23 | | **`9.18-22.04_beta`** | 04/2027 | 04/2032 | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | **`9.18-22.04_beta`** | 04/2027 | 04/2032 | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 404 | 24 | | `9.16-20.04_beta` | 04/2025 | 04/2030 | Bind9 9.16.1 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 24 | | `9.16-20.04_beta` | 04/2025 | 04/2030 | Bind9 9.16.1 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 405 | 25 | | _`track_risk`_ | | 25 | | _`track_risk`_ | |
| 406 | 26 | 26 | ||
| 407 | 27 | 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`. | 27 | 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`. |
| 408 | diff --git a/docs/public.ecr.aws/lts/cassandra.md b/docs/public.ecr.aws/lts/cassandra.md | |||
| 409 | index 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 | 29 | 29 | ||
| 414 | 30 | <!-- _Tags in italics are not available in public.ecr.aws/lts/cassandra but are shown here for completeness._ --> | 30 | <!-- _Tags in italics are not available in public.ecr.aws/lts/cassandra but are shown here for completeness._ --> |
| 415 | 31 | 31 | ||
| 417 | 32 | | Channel Tags |  until |  until | Currently | Architectures | | 32 | | Channel Tags |  until |  until | Currently | Architectures | |
| 418 | 33 | |---|---|---|---|---| | 33 | |---|---|---|---|---| |
| 419 | 34 | | _`track_risk`_ | | 34 | | _`track_risk`_ | |
| 420 | 35 | 35 | ||
| 421 | diff --git a/docs/public.ecr.aws/lts/cortex.md b/docs/public.ecr.aws/lts/cortex.md | |||
| 422 | index 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 | 25 | 25 | ||
| 427 | 26 | <!-- _Tags in italics are not available in public.ecr.aws/lts/cortex but are shown here for completeness._ --> | 26 | <!-- _Tags in italics are not available in public.ecr.aws/lts/cortex but are shown here for completeness._ --> |
| 428 | 27 | 27 | ||
| 430 | 28 | | Channel Tags |  until |  until | Currently | Architectures | | 28 | | Channel Tags |  until |  until | Currently | Architectures | |
| 431 | 29 | |---|---|---|---|---| | 29 | |---|---|---|---|---| |
| 432 | 30 | | _`track_risk`_ | | 30 | | _`track_risk`_ | |
| 433 | 31 | 31 | ||
| 434 | diff --git a/docs/public.ecr.aws/lts/grafana.md b/docs/public.ecr.aws/lts/grafana.md | |||
| 435 | index 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 | 18 | 18 | ||
| 440 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/grafana but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/grafana but are shown here for completeness._ --> |
| 441 | 20 | 20 | ||
| 443 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 444 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 445 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 446 | 24 | 24 | ||
| 447 | diff --git a/docs/public.ecr.aws/lts/kafka.md b/docs/public.ecr.aws/lts/kafka.md | |||
| 448 | index 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 | 18 | 18 | ||
| 453 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/kafka but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/kafka but are shown here for completeness._ --> |
| 454 | 20 | 20 | ||
| 456 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 457 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 458 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 459 | 24 | 24 | ||
| 460 | diff --git a/docs/public.ecr.aws/lts/loki.md b/docs/public.ecr.aws/lts/loki.md | |||
| 461 | index 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 | 18 | 18 | ||
| 466 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/loki but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/loki but are shown here for completeness._ --> |
| 467 | 20 | 20 | ||
| 469 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 470 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 471 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 472 | 24 | 24 | ||
| 473 | diff --git a/docs/public.ecr.aws/lts/memcached.md b/docs/public.ecr.aws/lts/memcached.md | |||
| 474 | index 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 | 18 | 18 | ||
| 479 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/memcached but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/memcached but are shown here for completeness._ --> |
| 480 | 20 | 20 | ||
| 482 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 483 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 485 | 23 | | **`1.5-20.04_beta`** | 04/2025 | 04/2030 | Memcached 1.5.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | **`1.5-20.04_beta`** | 04/2025 | 04/2030 | Memcached 1.5.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 486 | 24 | | _`track_risk`_ | | 24 | | _`track_risk`_ | |
| 487 | 25 | 25 | ||
| 488 | 26 | 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`. | 26 | 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`. |
| 489 | diff --git a/docs/public.ecr.aws/lts/mysql.md b/docs/public.ecr.aws/lts/mysql.md | |||
| 490 | index 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 | 18 | 18 | ||
| 495 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/mysql but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/mysql but are shown here for completeness._ --> |
| 496 | 20 | 20 | ||
| 498 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 499 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 502 | 23 | | **`8.0-22.04_beta`** | 04/2027 | 04/2032 | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | **`8.0-22.04_beta`** | 04/2027 | 04/2032 | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 503 | 24 | | `8.0-20.04_beta` | 04/2025 | 04/2030 | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 24 | | `8.0-20.04_beta` | 04/2025 | 04/2030 | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 504 | 25 | | _`track_risk`_ | | 25 | | _`track_risk`_ | |
| 505 | 26 | 26 | ||
| 506 | 27 | 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`. | 27 | 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`. |
| 507 | diff --git a/docs/public.ecr.aws/lts/nginx.md b/docs/public.ecr.aws/lts/nginx.md | |||
| 508 | index 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 | 18 | 18 | ||
| 513 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/nginx but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/nginx but are shown here for completeness._ --> |
| 514 | 20 | 20 | ||
| 516 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 517 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 520 | 23 | | **`1.18-22.04_beta`** | 04/2027 | 04/2032 | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | **`1.18-22.04_beta`** | 04/2027 | 04/2032 | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 521 | 24 | | `1.18-20.04_beta` | 04/2025 | 04/2030 | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 24 | | `1.18-20.04_beta` | 04/2025 | 04/2030 | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 522 | 25 | | _`track_risk`_ | | 25 | | _`track_risk`_ | |
| 523 | 26 | 26 | ||
| 524 | 27 | 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`. | 27 | 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`. |
| 525 | diff --git a/docs/public.ecr.aws/lts/postgres.md b/docs/public.ecr.aws/lts/postgres.md | |||
| 526 | index 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 | 18 | 18 | ||
| 531 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/postgres but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/postgres but are shown here for completeness._ --> |
| 532 | 20 | 20 | ||
| 534 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 535 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 538 | 23 | | **`14-22.04_beta`** | 04/2027 | 04/2032 | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | **`14-22.04_beta`** | 04/2027 | 04/2032 | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 539 | 24 | | `12-20.04_beta` | 04/2025 | 04/2030 | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 24 | | `12-20.04_beta` | 04/2025 | 04/2030 | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 540 | 25 | | _`track_risk`_ | | 25 | | _`track_risk`_ | |
| 541 | 26 | 26 | ||
| 542 | 27 | 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`. | 27 | 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`. |
| 543 | diff --git a/docs/public.ecr.aws/lts/prometheus-alertmanager.md b/docs/public.ecr.aws/lts/prometheus-alertmanager.md | |||
| 544 | index 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 | 18 | 18 | ||
| 549 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus-alertmanager but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus-alertmanager but are shown here for completeness._ --> |
| 550 | 20 | 20 | ||
| 552 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 553 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 554 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 555 | 24 | 24 | ||
| 556 | diff --git a/docs/public.ecr.aws/lts/prometheus.md b/docs/public.ecr.aws/lts/prometheus.md | |||
| 557 | index 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 | 18 | 18 | ||
| 562 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/prometheus but are shown here for completeness._ --> |
| 563 | 20 | 20 | ||
| 565 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 566 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 567 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 568 | 24 | 24 | ||
| 569 | diff --git a/docs/public.ecr.aws/lts/redis.md b/docs/public.ecr.aws/lts/redis.md | |||
| 570 | index 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 | 18 | 18 | ||
| 575 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/redis but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/redis but are shown here for completeness._ --> |
| 576 | 20 | 20 | ||
| 578 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 579 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 580 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 581 | 24 | 24 | ||
| 582 | diff --git a/docs/public.ecr.aws/lts/squid.md b/docs/public.ecr.aws/lts/squid.md | |||
| 583 | index 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 | 18 | 18 | ||
| 588 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/squid but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/squid but are shown here for completeness._ --> |
| 589 | 20 | 20 | ||
| 591 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 592 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 595 | 23 | | **`5.2-22.04_beta`** | 04/2027 | 04/2032 | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 23 | | **`5.2-22.04_beta`** | 04/2027 | 04/2032 | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 596 | 24 | | `4.10-20.04_beta` | 04/2025 | 04/2030 | Squid 4.10 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 24 | | `4.10-20.04_beta` | 04/2025 | 04/2030 | Squid 4.10 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 597 | 25 | | _`track_risk`_ | | 25 | | _`track_risk`_ | |
| 598 | 26 | 26 | ||
| 599 | 27 | 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`. | 27 | 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`. |
| 600 | diff --git a/docs/public.ecr.aws/lts/telegraf.md b/docs/public.ecr.aws/lts/telegraf.md | |||
| 601 | index 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 | 18 | 18 | ||
| 606 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/telegraf but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/telegraf but are shown here for completeness._ --> |
| 607 | 20 | 20 | ||
| 609 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 610 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 611 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 612 | 24 | 24 | ||
| 613 | diff --git a/docs/public.ecr.aws/lts/ubuntu.md b/docs/public.ecr.aws/lts/ubuntu.md | |||
| 614 | 25 | new file mode 100644 | 25 | new file mode 100644 |
| 615 | index 0000000..4cf6972 | |||
| 616 | --- /dev/null | |||
| 617 | +++ b/docs/public.ecr.aws/lts/ubuntu.md | |||
| 618 | @@ -0,0 +1,34 @@ | |||
| 619 | 1 | # Ubuntu | ||
| 620 | 2 | |||
| 621 | 3 | |||
| 622 | 4 | ## LTS Docker Image Portfolio | ||
| 623 | 5 | 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 | 6 | |||
| 625 | 7 | ## About Ubuntu | ||
| 626 | 8 | |||
| 627 | 9 |  | ||
| 628 | 10 | |||
| 629 | 11 | 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 | 12 | |||
| 631 | 13 | |||
| 632 | 14 | ## Tags and Architectures | ||
| 633 | 15 |  | ||
| 634 | 16 | Up to 5 years free security maintenance from this repository. | ||
| 635 | 17 | |||
| 636 | 18 |  | ||
| 637 | 19 | Up to 10 years customer security maintenance `from canonical/ubuntu`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). | ||
| 638 | 20 | |||
| 639 | 21 | <!-- _Tags in italics are not available in public.ecr.aws/lts/ubuntu but are shown here for completeness._ --> | ||
| 640 | 22 | |||
| 641 | 23 | | Channel Tags | |  until |  until | Currently | Architectures | | ||
| 642 | 24 | |---|---|---|---|---|---| | ||
| 643 | 25 | | **`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 | 26 | | `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 | 27 | | `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 | 28 | | _`track_risk`_ | | ||
| 647 | 29 | |||
| 648 | 30 | 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 | 31 | |||
| 650 | 32 | ### Commercial use and Extended Security Maintenance channels | ||
| 651 | 33 | 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 | 34 | |||
| 653 | diff --git a/docs/public.ecr.aws/lts/usage/ubuntu.md b/docs/public.ecr.aws/lts/usage/ubuntu.md | |||
| 654 | 0 | new file mode 100644 | 35 | new file mode 100644 |
| 655 | index 0000000..1c152b9 | |||
| 656 | --- /dev/null | |||
| 657 | +++ b/docs/public.ecr.aws/lts/usage/ubuntu.md | |||
| 658 | @@ -0,0 +1,44 @@ | |||
| 659 | 1 | |||
| 660 | 2 | |||
| 661 | 3 | |||
| 662 | 4 | |||
| 663 | 5 | |||
| 664 | 6 | |||
| 665 | 7 | ## Docker CLI | ||
| 666 | 8 | |||
| 667 | 9 | Launch this image locally: | ||
| 668 | 10 | |||
| 669 | 11 | ```sh | ||
| 670 | 12 | docker run -d --name ubuntu-container -e TZ=UTC public.ecr.aws/ubuntu/ubuntu:22.04_stable | ||
| 671 | 13 | ``` | ||
| 672 | 14 | |||
| 673 | 15 | |||
| 674 | 16 | #### Testing/Debugging | ||
| 675 | 17 | |||
| 676 | 18 | To debug the container: | ||
| 677 | 19 | |||
| 678 | 20 | ```sh | ||
| 679 | 21 | docker logs -f ubuntu-container | ||
| 680 | 22 | ``` | ||
| 681 | 23 | |||
| 682 | 24 | To get an interactive shell: | ||
| 683 | 25 | |||
| 684 | 26 | ```sh | ||
| 685 | 27 | docker exec -it ubuntu-container /bin/bash | ||
| 686 | 28 | ``` | ||
| 687 | 29 | |||
| 688 | 30 | |||
| 689 | 31 | |||
| 690 | 32 | ## Bugs and feature requests | ||
| 691 | 33 | |||
| 692 | 34 | If you find a bug in our image or want to request a specific feature, please file a bug here: | ||
| 693 | 35 | |||
| 694 | 36 | [https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug) | ||
| 695 | 37 | |||
| 696 | 38 | Please title the bug "`ubuntu: <issue summary>`". Make sure to include the digest of the image you are using, from: | ||
| 697 | 39 | |||
| 698 | 40 | ```sh | ||
| 699 | 41 | docker images --no-trunc --quiet public.ecr.aws/ubuntu/ubuntu:<tag> | ||
| 700 | 42 | ``` | ||
| 701 | 43 | |||
| 702 | 44 | |||
| 703 | diff --git a/docs/public.ecr.aws/lts/zookeeper.md b/docs/public.ecr.aws/lts/zookeeper.md | |||
| 704 | index 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 | 18 | 18 | ||
| 709 | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/zookeeper but are shown here for completeness._ --> | 19 | <!-- _Tags in italics are not available in public.ecr.aws/lts/zookeeper but are shown here for completeness._ --> |
| 710 | 20 | 20 | ||
| 712 | 21 | | Channel Tags |  until |  until | Currently | Architectures | | 21 | | Channel Tags |  until |  until | Currently | Architectures | |
| 713 | 22 | |---|---|---|---|---| | 22 | |---|---|---|---|---| |
| 714 | 23 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 715 | 24 | 24 | ||
| 716 | diff --git a/docs/public.ecr.aws/ubuntu/apache2.md b/docs/public.ecr.aws/ubuntu/apache2.md | |||
| 717 | index 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 | 1 | # Apache2 | Ubuntu | 1 | # Apache2 | Ubuntu |
| 722 | 2 | 2 | ||
| 723 | 3 | |||
| 724 | 3 | 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. | 4 | 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 | 4 | 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). | 5 | 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 | 5 | 6 | ||
| 727 | @@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/apache2`. [Request | |||
| 728 | 17 | 18 | ||
| 729 | 18 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 730 | 19 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 733 | 20 | | **`2.4-22.04_beta`** | [](https://gallery.ecr.aws/lts/apache2) | [](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`2.4-22.04_beta`** | [](https://gallery.ecr.aws/lts/apache2) | [](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 734 | 21 | | `2.4-21.10_beta` | [-](https://gallery.ecr.aws/lts/apache2) | [-](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `2.4-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 735 | 22 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 736 | 23 | 24 | ||
| 738 | 24 | _The following tags might not be available in public.ecr.aws/ubuntu/apache2 but are shown here for completeness:_ | 25 | _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 | 25 | 26 | ||
| 740 | 26 | | Channel Tags | | | Currently | Architectures | | 27 | | Channel Tags | | | Currently | Architectures | |
| 741 | 27 | |---|---|---|---|---| | 28 | |---|---|---|---|---| |
| 744 | 28 | | _**`2.4-22.04_beta`** _ | [](https://gallery.ecr.aws/lts/apache2) | [](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 29 | | _**`2.4-22.04_beta`**_ | [](https://gallery.ecr.aws/lts/apache2) | [](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 745 | 29 | | _`2.4-20.04_beta` _ | [](https://gallery.ecr.aws/lts/apache2) | [](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 30 | | _`2.4-20.04_beta`_ | [](https://gallery.ecr.aws/lts/apache2) | [](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 746 | 30 | | _`track_risk`_ | | 31 | | _`track_risk`_ | |
| 747 | 31 | 32 | ||
| 748 | 32 | 33 | ||
| 749 | diff --git a/docs/public.ecr.aws/ubuntu/bind9.md b/docs/public.ecr.aws/ubuntu/bind9.md | |||
| 750 | index 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 | 1 | # Bind9 | Ubuntu | 1 | # Bind9 | Ubuntu |
| 755 | 2 | 2 | ||
| 756 | 3 | |||
| 757 | 3 | 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. | 4 | 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 | 4 | 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). | 5 | 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 | 5 | 6 | ||
| 760 | @@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/bind9`. [Request ac | |||
| 761 | 17 | 18 | ||
| 762 | 18 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 763 | 19 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 766 | 20 | | **`9.18-22.04_beta`** | [](https://gallery.ecr.aws/lts/bind9) | [](https://gallery.ecr.aws/lts/bind9) | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`9.18-22.04_beta`** | [](https://gallery.ecr.aws/lts/bind9) | [](https://gallery.ecr.aws/lts/bind9) | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 767 | 21 | | `9.16-21.10_beta` | [-](https://gallery.ecr.aws/lts/bind9) | [-](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `9.16-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 768 | 22 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 769 | 23 | 24 | ||
| 771 | 24 | _The following tags might not be available in public.ecr.aws/ubuntu/bind9 but are shown here for completeness:_ | 25 | _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 | 25 | 26 | ||
| 773 | 26 | | Channel Tags | | | Currently | Architectures | | 27 | | Channel Tags | | | Currently | Architectures | |
| 774 | 27 | |---|---|---|---|---| | 28 | |---|---|---|---|---| |
| 777 | 28 | | _**`9.18-22.04_beta`** _ | [](https://gallery.ecr.aws/lts/bind9) | [](https://gallery.ecr.aws/lts/bind9) | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 29 | | _**`9.18-22.04_beta`**_ | [](https://gallery.ecr.aws/lts/bind9) | [](https://gallery.ecr.aws/lts/bind9) | Bind9 9.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 778 | 29 | | _`9.16-20.04_beta` _ | [](https://gallery.ecr.aws/lts/bind9) | [](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.1 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 30 | | _`9.16-20.04_beta`_ | [](https://gallery.ecr.aws/lts/bind9) | [](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.1 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 779 | 30 | | _`track_risk`_ | | 31 | | _`track_risk`_ | |
| 780 | 31 | 32 | ||
| 781 | 32 | 33 | ||
| 782 | diff --git a/docs/public.ecr.aws/ubuntu/cassandra.md b/docs/public.ecr.aws/ubuntu/cassandra.md | |||
| 783 | index 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 | 11 | 11 | ||
| 788 | 12 | # Apache Cassandra | Ubuntu | 12 | # Apache Cassandra | Ubuntu |
| 789 | 13 | 13 | ||
| 790 | 14 | |||
| 791 | 14 | 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. | 15 | 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 | 15 | 16 | ||
| 793 | 16 | ## About Apache Cassandra | 17 | ## About Apache Cassandra |
| 794 | @@ -27,7 +28,7 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques | |||
| 795 | 27 | 28 | ||
| 796 | 28 | | Channel Tags | | | Currently | Architectures | | 29 | | Channel Tags | | | Currently | Architectures | |
| 797 | 29 | |---|---|---|---|---| | 30 | |---|---|---|---|---| |
| 799 | 30 | | **`4.0-22.04_beta`** | [-](https://gallery.ecr.aws/lts/cassandra) | [-](https://gallery.ecr.aws/lts/cassandra) | Apache Cassandra 4.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 31 | | **`4.0-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/cassandra) | Apache Cassandra 4.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 800 | 31 | | _`track_risk`_ | | 32 | | _`track_risk`_ | |
| 801 | 32 | 33 | ||
| 802 | 33 | 34 | ||
| 803 | diff --git a/docs/public.ecr.aws/ubuntu/cortex.md b/docs/public.ecr.aws/ubuntu/cortex.md | |||
| 804 | index 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 | 1 | # Cortex | Ubuntu | 1 | # Cortex | Ubuntu |
| 809 | 2 | 2 | ||
| 810 | 3 | |||
| 811 | 3 | 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. | 4 | 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 | 4 | 5 | ||
| 813 | 5 | ## About Cortex | 6 | ## About Cortex |
| 814 | @@ -23,7 +24,7 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a | |||
| 815 | 23 | 24 | ||
| 816 | 24 | | Channel Tags | | | Currently | Architectures | | 25 | | Channel Tags | | | Currently | Architectures | |
| 817 | 25 | |---|---|---|---|---| | 26 | |---|---|---|---|---| |
| 819 | 26 | | **`1.11-22.04_beta`** | [-](https://gallery.ecr.aws/lts/cortex) | [-](https://gallery.ecr.aws/lts/cortex) | Cortex 1.11 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 27 | | **`1.11-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/cortex) | Cortex 1.11 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 820 | 27 | | _`track_risk`_ | | 28 | | _`track_risk`_ | |
| 821 | 28 | 29 | ||
| 822 | 29 | 30 | ||
| 823 | diff --git a/docs/public.ecr.aws/ubuntu/grafana.md b/docs/public.ecr.aws/ubuntu/grafana.md | |||
| 824 | index 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 | 1 | # Grafana™ software | Ubuntu | 1 | # Grafana™ software | Ubuntu |
| 829 | 2 | 2 | ||
| 830 | 3 | |||
| 831 | 3 | 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. | 4 | 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 | 4 | 5 | ||
| 833 | 5 | ## About Grafana™ software | 6 | ## About Grafana™ software |
| 834 | @@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request | |||
| 835 | 16 | 17 | ||
| 836 | 17 | | Channel Tags | | | Currently | Architectures | | 18 | | Channel Tags | | | Currently | Architectures | |
| 837 | 18 | |---|---|---|---|---| | 19 | |---|---|---|---|---| |
| 839 | 19 | | **`8.2-22.04_beta`** | [-](https://gallery.ecr.aws/lts/grafana) | [-](https://gallery.ecr.aws/lts/grafana) | Grafana™ software 8.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 20 | | **`8.2-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/grafana) | Grafana™ software 8.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 840 | 20 | | _`track_risk`_ | | 21 | | _`track_risk`_ | |
| 841 | 21 | 22 | ||
| 842 | 22 | 23 | ||
| 843 | diff --git a/docs/public.ecr.aws/ubuntu/kafka.md b/docs/public.ecr.aws/ubuntu/kafka.md | |||
| 844 | index 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 | 1 | # Apache Kafka | Ubuntu | 1 | # Apache Kafka | Ubuntu |
| 849 | 2 | 2 | ||
| 850 | 3 | |||
| 851 | 3 | 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. | 4 | 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 | 4 | 5 | ||
| 853 | 5 | ## About Apache Kafka | 6 | ## About Apache Kafka |
| 854 | @@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/kafka`. [Request ac | |||
| 855 | 16 | 17 | ||
| 856 | 17 | | Channel Tags | | | Currently | Architectures | | 18 | | Channel Tags | | | Currently | Architectures | |
| 857 | 18 | |---|---|---|---|---| | 19 | |---|---|---|---|---| |
| 859 | 19 | | **`3.1-22.04_beta`** | [-](https://gallery.ecr.aws/lts/kafka) | [-](https://gallery.ecr.aws/lts/kafka) | Apache Kafka 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 20 | | **`3.1-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/kafka) | Apache Kafka 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 860 | 20 | | _`track_risk`_ | | 21 | | _`track_risk`_ | |
| 861 | 21 | 22 | ||
| 862 | 22 | 23 | ||
| 863 | diff --git a/docs/public.ecr.aws/ubuntu/loki.md b/docs/public.ecr.aws/ubuntu/loki.md | |||
| 864 | index 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 | 1 | # Grafana Loki™ software | Ubuntu | 1 | # Grafana Loki™ software | Ubuntu |
| 869 | 2 | 2 | ||
| 870 | 3 | |||
| 871 | 3 | 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. | 4 | 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 | 4 | 5 | ||
| 873 | 5 | ## About Grafana Loki™ software | 6 | ## About Grafana Loki™ software |
| 874 | @@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/loki`. [Request acc | |||
| 875 | 16 | 17 | ||
| 876 | 17 | | Channel Tags | | | Currently | Architectures | | 18 | | Channel Tags | | | Currently | Architectures | |
| 877 | 18 | |---|---|---|---|---| | 19 | |---|---|---|---|---| |
| 879 | 19 | | **`2.4-22.04_beta`** | [-](https://gallery.ecr.aws/lts/loki) | [-](https://gallery.ecr.aws/lts/loki) | Grafana Loki™ software 2.4.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 20 | | **`2.4-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/loki) | Grafana Loki™ software 2.4.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 880 | 20 | | _`track_risk`_ | | 21 | | _`track_risk`_ | |
| 881 | 21 | 22 | ||
| 882 | 22 | 23 | ||
| 883 | diff --git a/docs/public.ecr.aws/ubuntu/memcached.md b/docs/public.ecr.aws/ubuntu/memcached.md | |||
| 884 | index 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 | 1 | # Memcached | Ubuntu | 1 | # Memcached | Ubuntu |
| 889 | 2 | 2 | ||
| 890 | 3 | |||
| 891 | 3 | 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. | 4 | 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 | 4 | 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). | 5 | 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 | 5 | 6 | ||
| 894 | @@ -17,15 +18,15 @@ Up to 10 years customer security maintenance `from canonical/memcached`. [Reques | |||
| 895 | 17 | 18 | ||
| 896 | 18 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 897 | 19 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 900 | 20 | | **`1.6-22.04_beta`** | [-](https://gallery.ecr.aws/lts/memcached) | [-](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`1.6-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 901 | 21 | | `1.6-21.10_beta` | [-](https://gallery.ecr.aws/lts/memcached) | [-](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `1.6-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 902 | 22 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 903 | 23 | 24 | ||
| 905 | 24 | _The following tags might not be available in public.ecr.aws/ubuntu/memcached but are shown here for completeness:_ | 25 | _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 | 25 | 26 | ||
| 907 | 26 | | Channel Tags | | | Currently | Architectures | | 27 | | Channel Tags | | | Currently | Architectures | |
| 908 | 27 | |---|---|---|---|---| | 28 | |---|---|---|---|---| |
| 910 | 28 | | _**`1.5-20.04_beta`** _ | [](https://gallery.ecr.aws/lts/memcached) | [](https://gallery.ecr.aws/lts/memcached) | Memcached 1.5.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 29 | | _**`1.5-20.04_beta`**_ | [](https://gallery.ecr.aws/lts/memcached) | [](https://gallery.ecr.aws/lts/memcached) | Memcached 1.5.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 911 | 29 | | _`track_risk`_ | | 30 | | _`track_risk`_ | |
| 912 | 30 | 31 | ||
| 913 | 31 | 32 | ||
| 914 | diff --git a/docs/public.ecr.aws/ubuntu/mysql.md b/docs/public.ecr.aws/ubuntu/mysql.md | |||
| 915 | index 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 | 1 | # MySQL™ software | Ubuntu | 1 | # MySQL™ software | Ubuntu |
| 920 | 2 | 2 | ||
| 921 | 3 | |||
| 922 | 3 | 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. | 4 | 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 | 4 | 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). | 5 | 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 | 5 | 6 | ||
| 925 | @@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/mysql`. [Request ac | |||
| 926 | 17 | 18 | ||
| 927 | 18 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 928 | 19 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 931 | 20 | | **`8.0-22.04_beta`** | [](https://gallery.ecr.aws/lts/mysql) | [](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`8.0-22.04_beta`** | [](https://gallery.ecr.aws/lts/mysql) | [](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 932 | 21 | | `8.0-21.10_beta` | [-](https://gallery.ecr.aws/lts/mysql) | [-](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `8.0-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 933 | 22 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 934 | 23 | 24 | ||
| 936 | 24 | _The following tags might not be available in public.ecr.aws/ubuntu/mysql but are shown here for completeness:_ | 25 | _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 | 25 | 26 | ||
| 938 | 26 | | Channel Tags | | | Currently | Architectures | | 27 | | Channel Tags | | | Currently | Architectures | |
| 939 | 27 | |---|---|---|---|---| | 28 | |---|---|---|---|---| |
| 942 | 28 | | _**`8.0-22.04_beta`** _ | [](https://gallery.ecr.aws/lts/mysql) | [](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 29 | | _**`8.0-22.04_beta`**_ | [](https://gallery.ecr.aws/lts/mysql) | [](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 943 | 29 | | _`8.0-20.04_beta` _ | [](https://gallery.ecr.aws/lts/mysql) | [](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 30 | | _`8.0-20.04_beta`_ | [](https://gallery.ecr.aws/lts/mysql) | [](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 944 | 30 | | _`track_risk`_ | | 31 | | _`track_risk`_ | |
| 945 | 31 | 32 | ||
| 946 | 32 | 33 | ||
| 947 | diff --git a/docs/public.ecr.aws/ubuntu/nginx.md b/docs/public.ecr.aws/ubuntu/nginx.md | |||
| 948 | index 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 | 1 | # Nginx | Ubuntu | 1 | # Nginx | Ubuntu |
| 953 | 2 | 2 | ||
| 954 | 3 | |||
| 955 | 3 | 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. | 4 | 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 | 4 | 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). | 5 | 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 | 5 | 6 | ||
| 958 | @@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/nginx`. [Request ac | |||
| 959 | 17 | 18 | ||
| 960 | 18 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 961 | 19 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 964 | 20 | | **`1.18-22.04_beta`** | [](https://gallery.ecr.aws/lts/nginx) | [](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`1.18-22.04_beta`** | [](https://gallery.ecr.aws/lts/nginx) | [](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 965 | 21 | | `1.18-21.10_beta` | [-](https://gallery.ecr.aws/lts/nginx) | [-](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `1.18-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 966 | 22 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 967 | 23 | 24 | ||
| 969 | 24 | _The following tags might not be available in public.ecr.aws/ubuntu/nginx but are shown here for completeness:_ | 25 | _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 | 25 | 26 | ||
| 971 | 26 | | Channel Tags | | | Currently | Architectures | | 27 | | Channel Tags | | | Currently | Architectures | |
| 972 | 27 | |---|---|---|---|---| | 28 | |---|---|---|---|---| |
| 975 | 28 | | _**`1.18-22.04_beta`** _ | [](https://gallery.ecr.aws/lts/nginx) | [](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 29 | | _**`1.18-22.04_beta`**_ | [](https://gallery.ecr.aws/lts/nginx) | [](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 976 | 29 | | _`1.18-20.04_beta` _ | [](https://gallery.ecr.aws/lts/nginx) | [](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 30 | | _`1.18-20.04_beta`_ | [](https://gallery.ecr.aws/lts/nginx) | [](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 977 | 30 | | _`track_risk`_ | | 31 | | _`track_risk`_ | |
| 978 | 31 | 32 | ||
| 979 | 32 | 33 | ||
| 980 | diff --git a/docs/public.ecr.aws/ubuntu/postgres.md b/docs/public.ecr.aws/ubuntu/postgres.md | |||
| 981 | index 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 | 1 | # Postgres | Ubuntu | 1 | # Postgres | Ubuntu |
| 986 | 2 | 2 | ||
| 987 | 3 | |||
| 988 | 3 | 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. | 4 | 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 | 4 | 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). | 5 | 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 | 5 | 6 | ||
| 991 | @@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/postgres`. [Request | |||
| 992 | 17 | 18 | ||
| 993 | 18 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 994 | 19 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 997 | 20 | | **`14-22.04_beta`** | [](https://gallery.ecr.aws/lts/postgres) | [](https://gallery.ecr.aws/lts/postgres) | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`14-22.04_beta`** | [](https://gallery.ecr.aws/lts/postgres) | [](https://gallery.ecr.aws/lts/postgres) | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 998 | 21 | | `13-21.10_beta` | [-](https://gallery.ecr.aws/lts/postgres) | [-](https://gallery.ecr.aws/lts/postgres) | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `13-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/postgres) | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 999 | 22 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 1000 | 23 | 24 | ||
| 1002 | 24 | _The following tags might not be available in public.ecr.aws/ubuntu/postgres but are shown here for completeness:_ | 25 | _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 | 25 | 26 | ||
| 1004 | 26 | | Channel Tags | | | Currently | Architectures | | 27 | | Channel Tags | | | Currently | Architectures | |
| 1005 | 27 | |---|---|---|---|---| | 28 | |---|---|---|---|---| |
| 1008 | 28 | | _**`14-22.04_beta`** _ | [](https://gallery.ecr.aws/lts/postgres) | [](https://gallery.ecr.aws/lts/postgres) | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 29 | | _**`14-22.04_beta`**_ | [](https://gallery.ecr.aws/lts/postgres) | [](https://gallery.ecr.aws/lts/postgres) | Postgres 14 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1009 | 29 | | _`12-20.04_beta` _ | [](https://gallery.ecr.aws/lts/postgres) | [](https://gallery.ecr.aws/lts/postgres) | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 30 | | _`12-20.04_beta`_ | [](https://gallery.ecr.aws/lts/postgres) | [](https://gallery.ecr.aws/lts/postgres) | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1010 | 30 | | _`track_risk`_ | | 31 | | _`track_risk`_ | |
| 1011 | 31 | 32 | ||
| 1012 | 32 | 33 | ||
| 1013 | diff --git a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md | |||
| 1014 | index 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 | 1 | # Prometheus Alertmanager | Ubuntu | 1 | # Prometheus Alertmanager | Ubuntu |
| 1019 | 2 | 2 | ||
| 1020 | 3 | |||
| 1021 | 3 | 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. | 4 | 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 | 4 | 5 | ||
| 1023 | 5 | ## About Prometheus Alertmanager | 6 | ## About Prometheus Alertmanager |
| 1024 | @@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman | |||
| 1025 | 16 | 17 | ||
| 1026 | 17 | | Channel Tags | | | Currently | Architectures | | 18 | | Channel Tags | | | Currently | Architectures | |
| 1027 | 18 | |---|---|---|---|---| | 19 | |---|---|---|---|---| |
| 1029 | 19 | | **`0.23-22.04_beta`** | [-](https://gallery.ecr.aws/lts/prometheus-alertmanager) | [-](https://gallery.ecr.aws/lts/prometheus-alertmanager) | Prometheus Alertmanager 0.23 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 20 | | **`0.23-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/prometheus-alertmanager) | Prometheus Alertmanager 0.23 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1030 | 20 | | _`track_risk`_ | | 21 | | _`track_risk`_ | |
| 1031 | 21 | 22 | ||
| 1032 | 22 | 23 | ||
| 1033 | diff --git a/docs/public.ecr.aws/ubuntu/prometheus.md b/docs/public.ecr.aws/ubuntu/prometheus.md | |||
| 1034 | index 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 | 1 | # Prometheus | Ubuntu | 1 | # Prometheus | Ubuntu |
| 1039 | 2 | 2 | ||
| 1040 | 3 | |||
| 1041 | 3 | 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. | 4 | 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 | 4 | 5 | ||
| 1043 | 5 | ## About Prometheus | 6 | ## About Prometheus |
| 1044 | @@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque | |||
| 1045 | 16 | 17 | ||
| 1046 | 17 | | Channel Tags | | | Currently | Architectures | | 18 | | Channel Tags | | | Currently | Architectures | |
| 1047 | 18 | |---|---|---|---|---| | 19 | |---|---|---|---|---| |
| 1049 | 19 | | **`2.33-22.04_beta`** | [-](https://gallery.ecr.aws/lts/prometheus) | [-](https://gallery.ecr.aws/lts/prometheus) | Prometheus 2.33 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 20 | | **`2.33-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/prometheus) | Prometheus 2.33 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1050 | 20 | | _`track_risk`_ | | 21 | | _`track_risk`_ | |
| 1051 | 21 | 22 | ||
| 1052 | 22 | 23 | ||
| 1053 | diff --git a/docs/public.ecr.aws/ubuntu/redis.md b/docs/public.ecr.aws/ubuntu/redis.md | |||
| 1054 | index 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 | 1 | # Redis™ software | Ubuntu | 1 | # Redis™ software | Ubuntu |
| 1059 | 2 | 2 | ||
| 1060 | 3 | |||
| 1061 | 3 | 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. | 4 | 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 | 4 | 5 | ||
| 1063 | 5 | ## About Redis™ software | 6 | ## About Redis™ software |
| 1064 | @@ -16,8 +17,8 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac | |||
| 1065 | 16 | 17 | ||
| 1066 | 17 | | Channel Tags | | | Currently | Architectures | | 18 | | Channel Tags | | | Currently | Architectures | |
| 1067 | 18 | |---|---|---|---|---| | 19 | |---|---|---|---|---| |
| 1070 | 19 | | **`6.2-22.04_beta`** | [-](https://gallery.ecr.aws/lts/redis) | [-](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 20 | | **`6.2-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1071 | 20 | | `6.0-21.10_beta` | [-](https://gallery.ecr.aws/lts/redis) | [-](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | `6.0-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1072 | 21 | | _`track_risk`_ | | 22 | | _`track_risk`_ | |
| 1073 | 22 | 23 | ||
| 1074 | 23 | 24 | ||
| 1075 | diff --git a/docs/public.ecr.aws/ubuntu/squid.md b/docs/public.ecr.aws/ubuntu/squid.md | |||
| 1076 | index 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 | 1 | # Squid | Ubuntu | 1 | # Squid | Ubuntu |
| 1081 | 2 | 2 | ||
| 1082 | 3 | |||
| 1083 | 3 | 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. | 4 | 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 | 4 | 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). | 5 | 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 | 5 | 6 | ||
| 1086 | @@ -17,16 +18,16 @@ Up to 10 years customer security maintenance `from canonical/squid`. [Request ac | |||
| 1087 | 17 | 18 | ||
| 1088 | 18 | | Channel Tags | | | Currently | Architectures | | 19 | | Channel Tags | | | Currently | Architectures | |
| 1089 | 19 | |---|---|---|---|---| | 20 | |---|---|---|---|---| |
| 1092 | 20 | | **`5.2-22.04_beta`** | [](https://gallery.ecr.aws/lts/squid) | [](https://gallery.ecr.aws/lts/squid) | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | **`5.2-22.04_beta`** | [](https://gallery.ecr.aws/lts/squid) | [](https://gallery.ecr.aws/lts/squid) | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1093 | 21 | | `4.13-21.10_beta` | [-](https://gallery.ecr.aws/lts/squid) | [-](https://gallery.ecr.aws/lts/squid) | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 22 | | `4.13-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/squid) | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1094 | 22 | | _`track_risk`_ | | 23 | | _`track_risk`_ | |
| 1095 | 23 | 24 | ||
| 1097 | 24 | _The following tags might not be available in public.ecr.aws/ubuntu/squid but are shown here for completeness:_ | 25 | _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 | 25 | 26 | ||
| 1099 | 26 | | Channel Tags | | | Currently | Architectures | | 27 | | Channel Tags | | | Currently | Architectures | |
| 1100 | 27 | |---|---|---|---|---| | 28 | |---|---|---|---|---| |
| 1103 | 28 | | _**`5.2-22.04_beta`** _ | [](https://gallery.ecr.aws/lts/squid) | [](https://gallery.ecr.aws/lts/squid) | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 29 | | _**`5.2-22.04_beta`**_ | [](https://gallery.ecr.aws/lts/squid) | [](https://gallery.ecr.aws/lts/squid) | Squid 5.2 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1104 | 29 | | _`4.10-20.04_beta` _ | [](https://gallery.ecr.aws/lts/squid) | [](https://gallery.ecr.aws/lts/squid) | Squid 4.10 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 30 | | _`4.10-20.04_beta`_ | [](https://gallery.ecr.aws/lts/squid) | [](https://gallery.ecr.aws/lts/squid) | Squid 4.10 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1105 | 30 | | _`track_risk`_ | | 31 | | _`track_risk`_ | |
| 1106 | 31 | 32 | ||
| 1107 | 32 | 33 | ||
| 1108 | diff --git a/docs/public.ecr.aws/ubuntu/telegraf.md b/docs/public.ecr.aws/ubuntu/telegraf.md | |||
| 1109 | index 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 | 1 | # Telegraf™ software | Ubuntu | 1 | # Telegraf™ software | Ubuntu |
| 1114 | 2 | 2 | ||
| 1115 | 3 | |||
| 1116 | 3 | 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. | 4 | 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 | 4 | 5 | ||
| 1118 | 5 | ## About Telegraf™ software | 6 | ## About Telegraf™ software |
| 1119 | @@ -16,8 +17,8 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request | |||
| 1120 | 16 | 17 | ||
| 1121 | 17 | | Channel Tags | | | Currently | Architectures | | 18 | | Channel Tags | | | Currently | Architectures | |
| 1122 | 18 | |---|---|---|---|---| | 19 | |---|---|---|---|---| |
| 1125 | 19 | | **`1.21-22.04_beta`** | [-](https://gallery.ecr.aws/lts/telegraf) | [-](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.21 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 20 | | **`1.21-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.21 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1126 | 20 | | `1.19-21.10_beta` | [-](https://gallery.ecr.aws/lts/telegraf) | [-](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | | 21 | | `1.19-21.10_beta` | - | [-](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1127 | 21 | | _`track_risk`_ | | 22 | | _`track_risk`_ | |
| 1128 | 22 | 23 | ||
| 1129 | 23 | 24 | ||
| 1130 | diff --git a/docs/public.ecr.aws/ubuntu/ubuntu.md b/docs/public.ecr.aws/ubuntu/ubuntu.md | |||
| 1131 | 24 | new file mode 100644 | 25 | new file mode 100644 |
| 1132 | index 0000000..c4e9c01 | |||
| 1133 | --- /dev/null | |||
| 1134 | +++ b/docs/public.ecr.aws/ubuntu/ubuntu.md | |||
| 1135 | @@ -0,0 +1,56 @@ | |||
| 1136 | 1 | # Ubuntu | ||
| 1137 | 2 | |||
| 1138 | 3 | 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 | 4 | 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 | 5 | |||
| 1141 | 6 | ## About Ubuntu | ||
| 1142 | 7 | |||
| 1143 | 8 |  | ||
| 1144 | 9 | |||
| 1145 | 10 | 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 | 11 | |||
| 1147 | 12 | |||
| 1148 | 13 | ## Tags and Architectures | ||
| 1149 | 14 |  | ||
| 1150 | 15 | Up to 5 years free security maintenance [from public.ecr.aws/lts/ubuntu](https://gallery.ecr.aws/lts/ubuntu). | ||
| 1151 | 16 | |||
| 1152 | 17 |  | ||
| 1153 | 18 | Up to 10 years customer security maintenance `from canonical/ubuntu`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). | ||
| 1154 | 19 | |||
| 1155 | 20 | | Channel Tags | | | | Currently | Architectures | | ||
| 1156 | 21 | |---|---|---|---|---|---| | ||
| 1157 | 22 | | **`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 | 23 | | `22.04_stable` | `22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `22.04_stable`, `jammy`, `jammy-22.04_edge` | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2027 | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` | | ||
| 1159 | 24 | | `20.04_stable` | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `20.04_stable`, `focal`, `focal-20.04_edge` | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2025 | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2030 | Ubuntu 20.04 LTS "Focal Fossa" | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` | | ||
| 1160 | 25 | | `18.04_stable` | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `18.04_stable`, `bionic`, `bionic-18.04_edge` | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2023 | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver" | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` | | ||
| 1161 | 26 | | `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 | 27 | | _`track_risk`_ | | ||
| 1163 | 28 | |||
| 1164 | 29 | _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 | 30 | |||
| 1166 | 31 | | Channel Tags | | | | Currently | Architectures | | ||
| 1167 | 32 | |---|---|---|---|---|---| | ||
| 1168 | 33 | | _**`22.04_stable`**_ | **`22.04`, `22.04_beta`, `22.04_candidate`, `22.04_edge`, `22.04_stable`, `jammy`, `jammy-22.04_edge`** | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2027 | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2032 | Ubuntu 22.04 LTS "Jammy Jellyfish" | `amd64`, `arm64`, `arm`, `ppc64le`, `s390x` | | ||
| 1169 | 34 | | _`20.04_stable`_ | `20.04`, `20.04_beta`, `20.04_candidate`, `20.04_edge`, `20.04_stable`, `focal`, `focal-20.04_edge` | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2025 | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2030 | Ubuntu 20.04 LTS "Focal Fossa" | `arm`, `amd64`, `arm64`, `ppc64le`, `s390x` | | ||
| 1170 | 35 | | _`18.04_stable`_ | `18.04`, `18.04_beta`, `18.04_candidate`, `18.04_edge`, `18.04_stable`, `bionic`, `bionic-18.04_edge` | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2023 | [](https://gallery.ecr.aws/lts/ubuntu) until 04/2028 | Ubuntu 18.04 LTS "Bionic Beaver" | `arm`, `arm64`, `386`, `s390x`, `amd64`, `ppc64le` | | ||
| 1171 | 36 | | _`16.04_stable`_ | | - |  until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` | | ||
| 1172 | 37 | | _`14.04_stable`_ | | - |  until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`| | ||
| 1173 | 38 | | _`track_risk`_ | | ||
| 1174 | 39 | |||
| 1175 | 40 | |||
| 1176 | 41 | 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 | 42 | |||
| 1178 | 43 | |||
| 1179 | 44 | ### Commercial use and Extended Security Maintenance channels | ||
| 1180 | 45 | 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 | 46 | |||
| 1182 | 47 | ## Deprecated channels & tags | ||
| 1183 | 48 | 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 | 49 | |||
| 1185 | 50 | | Track | Version | EOL | Upgrade Path | | ||
| 1186 | 51 | |---|---|---|---| | ||
| 1187 | 52 | | ~~21.10-~~ | Ubuntu 21.10 "Impish Indri" | 07/2022 | 22.04_stable | | ||
| 1188 | 53 | | ~~21.04-~~ | Ubuntu 21.04 "Hirsute Hippo" | 01/2022 | ~~21.10~~ | | ||
| 1189 | 54 | | ~~20.10-~~ | Ubuntu 20.10 "Groovy Gorilla" | 07/2021 | ~~21.04~~ | | ||
| 1190 | 55 | | _`track`_ | | ||
| 1191 | 56 | |||
| 1192 | diff --git a/docs/public.ecr.aws/ubuntu/usage/ubuntu.md b/docs/public.ecr.aws/ubuntu/usage/ubuntu.md | |||
| 1193 | 0 | new file mode 100644 | 57 | new file mode 100644 |
| 1194 | index 0000000..a67dcae | |||
| 1195 | --- /dev/null | |||
| 1196 | +++ b/docs/public.ecr.aws/ubuntu/usage/ubuntu.md | |||
| 1197 | @@ -0,0 +1,45 @@ | |||
| 1198 | 1 | |||
| 1199 | 2 | |||
| 1200 | 3 | |||
| 1201 | 4 | |||
| 1202 | 5 | |||
| 1203 | 6 | |||
| 1204 | 7 | |||
| 1205 | 8 | ## Docker CLI | ||
| 1206 | 9 | |||
| 1207 | 10 | Launch this image locally: | ||
| 1208 | 11 | |||
| 1209 | 12 | ```sh | ||
| 1210 | 13 | docker run -d --name ubuntu-container -e TZ=UTC public.ecr.aws/ubuntu/ubuntu:22.04_stable | ||
| 1211 | 14 | ``` | ||
| 1212 | 15 | |||
| 1213 | 16 | |||
| 1214 | 17 | #### Testing/Debugging | ||
| 1215 | 18 | |||
| 1216 | 19 | To debug the container: | ||
| 1217 | 20 | |||
| 1218 | 21 | ```sh | ||
| 1219 | 22 | docker logs -f ubuntu-container | ||
| 1220 | 23 | ``` | ||
| 1221 | 24 | |||
| 1222 | 25 | To get an interactive shell: | ||
| 1223 | 26 | |||
| 1224 | 27 | ```sh | ||
| 1225 | 28 | docker exec -it ubuntu-container /bin/bash | ||
| 1226 | 29 | ``` | ||
| 1227 | 30 | |||
| 1228 | 31 | |||
| 1229 | 32 | |||
| 1230 | 33 | ## Bugs and feature requests | ||
| 1231 | 34 | |||
| 1232 | 35 | If you find a bug in our image or want to request a specific feature, please file a bug here: | ||
| 1233 | 36 | |||
| 1234 | 37 | [https://bugs.launchpad.net/ubuntu-docker-images/+filebug](https://bugs.launchpad.net/ubuntu-docker-images/+filebug) | ||
| 1235 | 38 | |||
| 1236 | 39 | Please title the bug "`ubuntu: <issue summary>`". Make sure to include the digest of the image you are using, from: | ||
| 1237 | 40 | |||
| 1238 | 41 | ```sh | ||
| 1239 | 42 | docker images --no-trunc --quiet public.ecr.aws/ubuntu/ubuntu:<tag> | ||
| 1240 | 43 | ``` | ||
| 1241 | 44 | |||
| 1242 | 45 | |||
| 1243 | diff --git a/docs/public.ecr.aws/ubuntu/zookeeper.md b/docs/public.ecr.aws/ubuntu/zookeeper.md | |||
| 1244 | index 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 | 1 | # Apache ZooKeeper | Ubuntu | 1 | # Apache ZooKeeper | Ubuntu |
| 1249 | 2 | 2 | ||
| 1250 | 3 | |||
| 1251 | 3 | 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. | 4 | 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 | 4 | 5 | ||
| 1253 | 5 | ## About Apache ZooKeeper | 6 | ## About Apache ZooKeeper |
| 1254 | @@ -16,7 +17,7 @@ Up to 10 years customer security maintenance `from canonical/zookeeper`. [Reques | |||
| 1255 | 16 | 17 | ||
| 1256 | 17 | | Channel Tags | | | Currently | Architectures | | 18 | | Channel Tags | | | Currently | Architectures | |
| 1257 | 18 | |---|---|---|---|---| | 19 | |---|---|---|---|---| |
| 1259 | 19 | | **`3.1-22.04_beta`** | [-](https://gallery.ecr.aws/lts/zookeeper) | [-](https://gallery.ecr.aws/lts/zookeeper) | Apache ZooKeeper 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | | 20 | | **`3.1-22.04_beta`** | - | [-](https://gallery.ecr.aws/lts/zookeeper) | Apache ZooKeeper 3.1.0 on Ubuntu 22.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` | |
| 1260 | 20 | | _`track_risk`_ | | 21 | | _`track_risk`_ | |
| 1261 | 21 | 22 | ||
| 1262 | 22 | 23 | ||
| 1263 | diff --git a/templates/README_DOCKERHUB.md b/templates/README_DOCKERHUB.md | |||
| 1264 | index a53245c..56dc52b 100644 | |||
| 1265 | --- a/templates/README_DOCKERHUB.md | |||
| 1266 | +++ b/templates/README_DOCKERHUB.md | |||
| 1267 | @@ -9,6 +9,9 @@ | |||
| 1268 | 9 | <% | 9 | <% |
| 1269 | 10 | baserepo='ubuntu' | 10 | baserepo='ubuntu' |
| 1270 | 11 | tag='latest' | 11 | tag='latest' |
| 1271 | 12 | has_tag_aliases=list(map(lambda r: len(r.get('tags', [])) > 1, releases)) | ||
| 1272 | 13 | tags_column_header=' foo | | ' if any(has_tag_aliases) else ' | ' | ||
| 1273 | 14 | tags_column_separator='|---|---' if any(has_tag_aliases) else '|---' | ||
| 1274 | 12 | risks=['stable', 'candidate', 'beta', 'edge'] | 15 | risks=['stable', 'candidate', 'beta', 'edge'] |
| 1275 | 13 | sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track']))) | 16 | sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track']))) |
| 1276 | 14 | filterfn=lambda release : 'deprecated' not in release | 17 | filterfn=lambda release : 'deprecated' not in release |
| 1277 | @@ -24,15 +27,15 @@ | |||
| 1278 | 24 | 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. | 27 | 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 | 25 | [Read more](https://ubuntu.com/about/release-cycle). | 28 | [Read more](https://ubuntu.com/about/release-cycle). |
| 1280 | 26 | 29 | ||
| 1282 | 27 | 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.** | 30 | 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 | 28 | % else: | 31 | % else: |
| 1284 | 29 | 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.** | 32 | 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 | 30 | % endif | 33 | % endif |
| 1286 | 31 | 34 | ||
| 1287 | 32 | <%include file="header.md" args="baserepo=baserepo, **locals()['pageargs']"/> | 35 | <%include file="header.md" args="baserepo=baserepo, **locals()['pageargs']"/> |
| 1288 | 33 | 36 | ||
| 1291 | 34 | | Channel Tags | | | Currently | Architectures | | 37 | | Channel Tags |${tags_column_header}| Currently | Architectures | |
| 1292 | 35 | |---|---|---|---|---| | 38 | ${tags_column_separator}|---|---|---|---| |
| 1293 | 36 | % for i, release in enumerate(current_releases): | 39 | % for i, release in enumerate(current_releases): |
| 1294 | 37 | <% | 40 | <% |
| 1295 | 38 | first=i==0 | 41 | first=i==0 |
| 1296 | @@ -45,13 +48,18 @@ Current ${application} Docker Image [from Canonical](https://ubuntu.com/security | |||
| 1297 | 45 | version=str(release['version']) if 'version' in release else track | 48 | version=str(release['version']) if 'version' in release else track |
| 1298 | 46 | architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures'])) | 49 | architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures'])) |
| 1299 | 47 | swver='.'.join(track.split(".")[:2]) | 50 | swver='.'.join(track.split(".")[:2]) |
| 1300 | 48 | auto_tags=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', []))) | ||
| 1301 | 49 | basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk | 51 | basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk |
| 1305 | 50 | thistag='`'+basetag+'`' if not auto_tags else auto_tags | 52 | all_tags=release.get('tags', []) |
| 1306 | 51 | usage_tag=basetag if not auto_tags else str(release.get('tags', ['latest'])[0]) | 53 | all_tags.sort() |
| 1307 | 52 | tags='**'+thistag+'**' if first else thistag | 54 | all_tags = list(filter(lambda x: x != basetag, all_tags)) |
| 1308 | 55 | tag_aliases=", ".join(map(lambda x: "`"+str(x)+"`", all_tags)) | ||
| 1309 | 56 | channel_tag='**`'+basetag+'`**' if first else '`'+basetag+'`' | ||
| 1310 | 57 | oci_tags='`'+basetag+'`' if not tag_aliases else tag_aliases | ||
| 1311 | 58 | usage_tag=basetag if not tag_aliases else str(release.get('tags', ['latest'])[0]) | ||
| 1312 | 59 | tags='**'+oci_tags+'**' if first else oci_tags | ||
| 1313 | 53 | first_lts_tag=basetag if type == 'LTS' and not first_lts_tag else first_lts_tag | 60 | first_lts_tag=basetag if type == 'LTS' and not first_lts_tag else first_lts_tag |
| 1315 | 54 | %> | ${tags} | ${'' if type == 'LTS' else '-'} ${'<br>until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | ${'' if type == 'LTS' else '-'} <br> ${'<br>until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu '+base+' '+basetype if application != "Ubuntu" else ''} | ${architectures} | | 61 | auto_tags_column=channel_tag+' | '+tags if any(has_tag_aliases) else channel_tag |
| 1316 | 62 | %> | ${auto_tags_column} | ${'' if type == 'LTS' else '-'} ${'<br>until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | ${'' if type == 'LTS' else '-'} ${'<br>until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu '+base+' '+basetype if application != "Ubuntu" else ''} | ${architectures} | | ||
| 1317 | 55 | % endfor | 63 | % endfor |
| 1318 | 56 | | _`track_risk`_ | | 64 | | _`track_risk`_ | |
| 1319 | 57 | 65 | ||
| 1320 | diff --git a/templates/README_ECR.md b/templates/README_ECR.md | |||
| 1321 | index 802b7c5..1decd01 100644 | |||
| 1322 | --- a/templates/README_ECR.md | |||
| 1323 | +++ b/templates/README_ECR.md | |||
| 1324 | @@ -9,6 +9,9 @@ | |||
| 1325 | 9 | <% | 9 | <% |
| 1326 | 10 | baserepo='public.ecr.aws/ubuntu' | 10 | baserepo='public.ecr.aws/ubuntu' |
| 1327 | 11 | tag='latest' | 11 | tag='latest' |
| 1328 | 12 | has_tag_aliases=list(map(lambda r: len(r.get('tags', [])) > 1, releases)) | ||
| 1329 | 13 | tags_column_header=' | | ' if any(has_tag_aliases) else ' | ' | ||
| 1330 | 14 | tags_column_separator='|---|---' if any(has_tag_aliases) else '|---' | ||
| 1331 | 12 | risks=['stable', 'candidate', 'beta', 'edge'] | 15 | risks=['stable', 'candidate', 'beta', 'edge'] |
| 1332 | 13 | sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])) ) | 16 | sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])) ) |
| 1333 | 14 | filtercurrentfn=lambda release : 'deprecated' not in release | 17 | filtercurrentfn=lambda release : 'deprecated' not in release |
| 1334 | @@ -17,12 +20,14 @@ | |||
| 1335 | 17 | current_releases=list(filter(filtercurrentfn, releases)) | 20 | current_releases=list(filter(filtercurrentfn, releases)) |
| 1336 | 18 | lts_releases=list(filter(filterltsfn, current_releases)) | 21 | lts_releases=list(filter(filterltsfn, current_releases)) |
| 1337 | 19 | old_releases=[release for release in releases if release not in current_releases] | 22 | old_releases=[release for release in releases if release not in current_releases] |
| 1338 | 20 | current_releases=[current_releases.pop(0)]+[release for release in current_releases if release not in lts_releases] | ||
| 1339 | 21 | has_an_lts=len(lts_releases)>0 | 23 | has_an_lts=len(lts_releases)>0 |
| 1340 | 22 | %> | 24 | %> |
| 1341 | 23 | % if application=="Ubuntu": | 25 | % if application=="Ubuntu": |
| 1342 | 24 | 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). | 26 | 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 | 25 | % else: | 27 | % else: |
| 1344 | 28 | <% | ||
| 1345 | 29 | current_releases=[current_releases.pop(0)]+[release for release in current_releases if release not in lts_releases] | ||
| 1346 | 30 | %> | ||
| 1347 | 26 | 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. | 31 | 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 | 27 | % endif | 32 | % endif |
| 1349 | 28 | % if has_an_lts: | 33 | % if has_an_lts: |
| 1350 | @@ -41,8 +46,8 @@ Up to 5 years free security maintenance${' [from public.ecr.aws/lts/'+repo+'](ht | |||
| 1351 | 41 | Up to 10 years customer security maintenance `from canonical/${repo}`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). | 46 | Up to 10 years customer security maintenance `from canonical/${repo}`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). |
| 1352 | 42 | % for k, list_releases in enumerate([current_releases, lts_releases] if has_an_lts else [current_releases]): | 47 | % for k, list_releases in enumerate([current_releases, lts_releases] if has_an_lts else [current_releases]): |
| 1353 | 43 | 48 | ||
| 1356 | 44 | | Channel Tags | | | Currently | Architectures | | 49 | | Channel Tags |${tags_column_header}| Currently | Architectures | |
| 1357 | 45 | |---|---|---|---|---| | 50 | ${tags_column_separator}|---|---|---|---| |
| 1358 | 46 | % for i, release in enumerate(list_releases): | 51 | % for i, release in enumerate(list_releases): |
| 1359 | 47 | <% | 52 | <% |
| 1360 | 48 | first=i==0 | 53 | first=i==0 |
| 1361 | @@ -57,19 +62,25 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request | |||
| 1362 | 57 | version=str(release['version']) if 'version' in release else track | 62 | version=str(release['version']) if 'version' in release else track |
| 1363 | 58 | architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures'])) | 63 | architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures'])) |
| 1364 | 59 | swver='.'.join(track.split(".")[:2]) | 64 | swver='.'.join(track.split(".")[:2]) |
| 1365 | 60 | auto_tags=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', []))) | ||
| 1366 | 61 | basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk | 65 | basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk |
| 1370 | 62 | thistag='`'+basetag+'`' if not auto_tags else auto_tags | 66 | all_tags=release.get('tags', []) |
| 1371 | 63 | tags='**'+thistag+'**' if first else thistag | 67 | all_tags.sort() |
| 1372 | 64 | %> | ${'_' if type == 'LTS' and k != 0 else ''}${tags} ${'_' if type == 'LTS' and k != 0 else ''} | [${'' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | [${'' 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 '+base+' '+basetype if application != "Ubuntu" else ''} | ${architectures} | | 68 | all_tags = list(filter(lambda x: x != basetag, all_tags)) |
| 1373 | 69 | tag_aliases=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', []))) | ||
| 1374 | 70 | oci_tags='`'+basetag+'`' if not tag_aliases else tag_aliases | ||
| 1375 | 71 | channel_tag='**`'+basetag+'`**' if first else '`'+basetag+'`' | ||
| 1376 | 72 | channel_tag='_'+channel_tag+'_' if type == 'LTS' and k != 0 else channel_tag | ||
| 1377 | 73 | tags='**'+oci_tags+'**' if first else oci_tags | ||
| 1378 | 74 | auto_tags_column=channel_tag+' | '+tags if any(has_tag_aliases) else channel_tag | ||
| 1379 | 75 | %> | ${auto_tags_column} | ${'[](https://gallery.ecr.aws/lts/'+repo+')' if type == 'LTS' else '-'} ${'until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | [${'' 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 '+base+' '+basetype if application != "Ubuntu" else ''} | ${architectures} | | ||
| 1380 | 65 | % endfor | 76 | % endfor |
| 1381 | 66 | % if application == "Ubuntu" and k == 1: | 77 | % if application == "Ubuntu" and k == 1: |
| 1384 | 67 | | _`16.04_stable`_ | - |  until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` | | 78 | | _`16.04_stable`_ ${tags_column_header} - |  until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` | |
| 1385 | 68 | | _`14.04_stable`_ | - |  until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`| | 79 | | _`14.04_stable`_ ${tags_column_header} - |  until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`| |
| 1386 | 69 | % endif | 80 | % endif |
| 1387 | 70 | | _`track_risk`_ | | 81 | | _`track_risk`_ | |
| 1388 | 71 | 82 | ||
| 1390 | 72 | ${'_The following tags might not be available in '+baserepo+'/'+repo+' but are shown here for completeness:_' if k==0 and has_an_lts else ''} | 83 | ${'_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 | 73 | % endfor | 84 | % endfor |
| 1392 | 74 | <%include file="channels_message.md" /> | 85 | <%include file="channels_message.md" /> |
| 1393 | 75 | 86 | ||
| 1394 | diff --git a/templates/README_ECR_LTS.md b/templates/README_ECR_LTS.md | |||
| 1395 | index 9c8b9db..68fea04 100644 | |||
| 1396 | --- a/templates/README_ECR_LTS.md | |||
| 1397 | +++ b/templates/README_ECR_LTS.md | |||
| 1398 | @@ -9,6 +9,9 @@ | |||
| 1399 | 9 | <% | 9 | <% |
| 1400 | 10 | baserepo='public.ecr.aws/lts' | 10 | baserepo='public.ecr.aws/lts' |
| 1401 | 11 | tag='latest' | 11 | tag='latest' |
| 1402 | 12 | has_tag_aliases=list(map(lambda r: len(r.get('tags', [])) > 1, releases)) | ||
| 1403 | 13 | tags_column_header=' | | ' if any(has_tag_aliases) else ' | ' | ||
| 1404 | 14 | tags_column_separator='|---|---' if any(has_tag_aliases) else '|---' | ||
| 1405 | 12 | risks=['stable', 'candidate', 'beta', 'edge'] | 15 | risks=['stable', 'candidate', 'beta', 'edge'] |
| 1406 | 13 | sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])) ) | 16 | sortfn=lambda release : (10**(2+risks.index(release['risk']))-float(release.get('base', release['track'])) ) |
| 1407 | 14 | filterltsfn=lambda release : release['type'] == 'LTS' or release['type'] == 'ESM' if 'type' in release else False | 17 | 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 | 33 | 36 | ||
| 1410 | 34 | <!-- _Tags in italics are not available in ${baserepo}/${repo} but are shown here for completeness._ --> | 37 | <!-- _Tags in italics are not available in ${baserepo}/${repo} but are shown here for completeness._ --> |
| 1411 | 35 | 38 | ||
| 1414 | 36 | | Channel Tags |  until |  until | Currently | Architectures | | 39 | | Channel Tags ${tags_column_header}  until |  until | Currently | Architectures | |
| 1415 | 37 | |---|---|---|---|---| | 40 | ${tags_column_separator}|---|---|---|---| |
| 1416 | 38 | % for i, release in enumerate(lts_releases): | 41 | % for i, release in enumerate(lts_releases): |
| 1417 | 39 | <% | 42 | <% |
| 1418 | 40 | first=i==0 | 43 | first=i==0 |
| 1419 | @@ -49,8 +52,15 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request | |||
| 1420 | 49 | version=str(release['version']) if 'version' in release else track | 52 | version=str(release['version']) if 'version' in release else track |
| 1421 | 50 | architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures'])) | 53 | architectures=", ".join(map(lambda x: "`"+x+"`", release['architectures'])) |
| 1422 | 51 | swver='.'.join(track.split(".")[:2]) | 54 | swver='.'.join(track.split(".")[:2]) |
| 1425 | 52 | thistag=swver+'-'+base+'_'+''+risk | 55 | thistag=swver+'-'+base+'_'+''+risk if application != 'Ubuntu' else swver+'_'+risk |
| 1426 | 53 | tag=thistag if first else tag | 56 | all_tags=release.get('tags', []) |
| 1427 | 57 | all_tags.sort() | ||
| 1428 | 58 | all_tags = list(filter(lambda x: x != thistag, all_tags)) | ||
| 1429 | 59 | tag_aliases=", ".join(map(lambda x: "`"+str(x)+"`", release.get('tags', []))) | ||
| 1430 | 60 | oci_tags='`'+thistag+'`' if not tag_aliases else tag_aliases | ||
| 1431 | 61 | channel_tag='**`'+thistag+'`**' if first else '`'+thistag+'`' | ||
| 1432 | 62 | tags='**'+oci_tags+'**' if first else oci_tags | ||
| 1433 | 63 | auto_tags_column=channel_tag+' | '+tags if any(has_tag_aliases) else channel_tag | ||
| 1434 | 54 | has_an_lts=(has_an_lts or type == 'LTS' or type == 'ESM') | 64 | has_an_lts=(has_an_lts or type == 'LTS' or type == 'ESM') |
| 1435 | 55 | sos_year=2000+int(base.split(".")[0]) | 65 | sos_year=2000+int(base.split(".")[0]) |
| 1436 | 56 | eol_year=sos_year+5 | 66 | eol_year=sos_year+5 |
| 1437 | @@ -59,7 +69,7 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request | |||
| 1438 | 59 | eoe_date=base.split(".")[1]+'/'+str(eoe_year) if not support.get('esm_until') else support['esm_until'] | 69 | eoe_date=base.split(".")[1]+'/'+str(eoe_year) if not support.get('esm_until') else support['esm_until'] |
| 1439 | 60 | eol=eol_date if basetype == 'LTS' else '-' | 70 | eol=eol_date if basetype == 'LTS' else '-' |
| 1440 | 61 | eoe=eoe_date if basetype == 'LTS' or basetype == 'ESM' else '-' | 71 | eoe=eoe_date if basetype == 'LTS' or basetype == 'ESM' else '-' |
| 1442 | 62 | %> | ${'**`'+thistag+'`**' if first else '`'+thistag+'`'} | ${eol} | ${eoe} | ${application} ${version} ${'on Ubuntu '+base+' '+basetype if application != "Ubuntu" else ''} | ${architectures} | | 72 | %> | ${auto_tags_column} | ${eol} | ${eoe} | ${application} ${version} ${'on Ubuntu '+base+' '+basetype if application != "Ubuntu" else ''} | ${architectures} | |
| 1443 | 63 | % endfor | 73 | % endfor |
| 1444 | 64 | | _`track_risk`_ | | 74 | | _`track_risk`_ | |
| 1445 | 65 | 75 | ||
| 1446 | diff --git a/templates/ubuntu.yaml b/templates/ubuntu.yaml | |||
| 1447 | index 9a87b33..f71e6e6 100644 | |||
| 1448 | --- a/templates/ubuntu.yaml | |||
| 1449 | +++ b/templates/ubuntu.yaml | |||
| 1450 | @@ -4,7 +4,7 @@ description: > | |||
| 1451 | 4 |  | 4 |  |
| 1452 | 5 | 5 | ||
| 1453 | 6 | 6 | ||
| 1455 | 7 | 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/). | 7 | 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 | 8 | docker: | 8 | docker: |
| 1457 | 9 | parameters: | 9 | parameters: |
| 1458 | 10 | debug: | 10 | debug: |
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.