Ubuntu Docker Images

Merge ~samiraka/ubuntu-docker-images/+git/templates:bionic-esm into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main

  1. Git
  2. lp:~samiraka/ubuntu-docker-images/+git/templates
  3. bionic-esm
  4. Merge into main
Proposed by Samir Akarioh
Status: Merged
Merged at revision: 99d449e8a7df18ba06728d61ee08c708d27be5e7
Proposed branch: ~samiraka/ubuntu-docker-images/+git/templates:bionic-esm
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main
Diff against target: 61 lines (+8/-6)
3 files modified
templates/README_DOCKERHUB.md (+3/-2)
templates/README_ECR.md (+3/-2)
templates/README_ECR_LTS.md (+2/-2)
Reviewer Review Type Date Requested Status
Cristovao Cordeiro Approve
Review via email: mp+443784@code.launchpad.net

Commit message

feat: Bionic going into ESM

Bionic is going into ESM on the 31st of May 2023, so this pull request must be merged after this date.

Signed_Off_By: Samir Akarioh <email address hidden>

To post a comment you must log in.
Revision history for this message
Cristovao Cordeiro (cjdc) :
review: Needs Information
Revision history for this message
Samir Akarioh (samiraka) :
Revision history for this message
Cristovao Cordeiro (cjdc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/README_DOCKERHUB.md b/templates/README_DOCKERHUB.md
2index fdf23e2..40f7744 100644
3--- a/templates/README_DOCKERHUB.md
4+++ b/templates/README_DOCKERHUB.md
5@@ -18,8 +18,8 @@
6 releases.sort(key=sortfn)
7 current_releases=list(filter(filterfn, releases))
8 old_releases=[release for release in releases if release not in current_releases]
9- LTS_BASES=['18.04', '20.04', '22.04']
10- ESM_BASES=['14.04', '16.04']
11+ LTS_BASES=['20.04', '22.04']
12+ ESM_BASES=['14.04', '16.04', '18.04']
13 first_lts_tag=''
14 %>
15 % if application=="Ubuntu":
16@@ -68,6 +68,7 @@ _The following tags are not available in this repository but are shown here for
17
18 | Channel Tag | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures |
19 |---|---|---|---|---|
20+| _`18.04_stable`_ &nbsp;&nbsp; | - | 04-2028 | Ubuntu Bionic Beaver 18.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le`, `i386` |
21 | _`16.04_stable`_ &nbsp;&nbsp; | - | 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
22 | _`14.04_stable`_ &nbsp;&nbsp; | - | 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
23 | _`track_risk`_ |
24diff --git a/templates/README_ECR.md b/templates/README_ECR.md
25index dc69ff8..4904054 100644
26--- a/templates/README_ECR.md
27+++ b/templates/README_ECR.md
28@@ -55,8 +55,8 @@ ${tags_column_separator}|---|---|---|---|
29 risk=str(release['risk'])
30 support=release.get('support', {})
31 base=str(release.get('base', ''))
32- LTS_BASES=['18.04', '20.04', '22.04']
33- ESM_BASES=['14.04', '16.04']
34+ LTS_BASES=['20.04', '22.04']
35+ ESM_BASES=['14.04', '16.04', 18.04]
36 basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else ''
37 type=str(release['type']) if 'type' in release else ''
38 version=str(release['version']) if 'version' in release else track
39@@ -75,6 +75,7 @@ ${tags_column_separator}|---|---|---|---|
40 %> | ${auto_tags_column} | ${'[![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/'+repo+')' if type == 'LTS' else '-'} ${'until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | [${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
41 % endfor
42 % if application == "Ubuntu" and k == 1:
43+| _`18.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2028 | Ubuntu Bionic Beaver 18.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le`, `i386` |
44 | _`16.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
45 | _`14.04_stable`_ &nbsp;&nbsp; ${tags_column_header} - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
46 % endif
47diff --git a/templates/README_ECR_LTS.md b/templates/README_ECR_LTS.md
48index 9de8bd6..7dfb583 100644
49--- a/templates/README_ECR_LTS.md
50+++ b/templates/README_ECR_LTS.md
51@@ -45,8 +45,8 @@ ${tags_column_separator}|---|---|---|---|
52 risk=str(release['risk'])
53 support=release.get('support', {})
54 base=str(release['base']) if application != 'Ubuntu' else track
55- LTS_BASES=['18.04', '20.04', '22.04']
56- ESM_BASES=['14.04', '16.04']
57+ LTS_BASES=['20.04', '22.04']
58+ ESM_BASES=['14.04', '16.04', '18.04']
59 basetype='LTS' if base in LTS_BASES else 'ESM' if base in ESM_BASES else ''
60 type=str(release['type']) if 'type' in release else ''
61 version=str(release['version']) if 'version' in release else track

Subscribers

People subscribed via source and target branches