Merge ~cjdc/ubuntu-docker-images/+git/templates:unsupported-br into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main

Proposed by Cristovao Cordeiro
Status: Merged
Merged at revision: 0f062b7df407b4b121aaa8a0110989842799cfc3
Proposed branch: ~cjdc/ubuntu-docker-images/+git/templates:unsupported-br
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main
Diff against target: 18 lines (+3/-3)
1 file modified
templates/README_ECR.md (+3/-3)
Reviewer Review Type Date Requested Status
Samir Akarioh (community) Approve
ROCKS Developers Pending
ROCKS Dev Account Pending
Review via email: mp+432463@code.launchpad.net

Commit message

fix: ECR doesn't render <br> properly. Removing until we find a better solution

To post a comment you must log in.
Revision history for this message
Samir Akarioh (samiraka) wrote :

Have you seen this to replace the <br> because ECR supports markdown normally: https://stackoverflow.com/questions/26626256/how-to-insert-a-line-break-br-in-markdown

review: Needs Information
Revision history for this message
Samir Akarioh (samiraka) wrote :

aboutText (string) --

A detailed description of the contents of the repository. It is publicly visible in the Amazon ECR Public Gallery. The text must be in markdown format.
usageText (string) --

Detailed information on how to use the contents of the repository. It is publicly visible in the Amazon ECR Public Gallery. The usage text provides context, support information, and additional usage details for users of the repository. The text must be in markdown format.

From: https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/ecr-public.html#ECRPublic.Client.put_repository_catalog_data

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

<br> is markdown compatible.

the \ and double space are a bit weird. and after testing, they don't make a diff in the ECR portal

Revision history for this message
Samir Akarioh (samiraka) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/README_ECR.md b/templates/README_ECR.md
2index 10523f3..802b7c5 100644
3--- a/templates/README_ECR.md
4+++ b/templates/README_ECR.md
5@@ -61,11 +61,11 @@ Up to 10 years customer security maintenance `from canonical/${repo}`. [Request
6 basetag=swver+'-'+base+'_'+''+risk if base else swver+'_'+risk
7 thistag='`'+basetag+'`' if not auto_tags else auto_tags
8 tags='**'+thistag+'**' if first else thistag
9-%> | ${'_' if type == 'LTS' and k != 0 else ''}${tags} &nbsp;&nbsp;${'_' if type == 'LTS' and k != 0 else ''} | [${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'<br>until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | [${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'<br>until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
10+%> | ${'_' if type == 'LTS' and k != 0 else ''}${tags} &nbsp;&nbsp;${'_' if type == 'LTS' and k != 0 else ''} | [${'![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'until '+support['lts_until'] if type == 'LTS' and support.get('lts_until') else ''} | [${'![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)' if type == 'LTS' else '-'}](https://gallery.ecr.aws/lts/${repo}) ${'until '+support['esm_until'] if type == 'LTS' and support.get('esm_until') else ''} | ${application} ${version} ${'on Ubuntu&nbsp;'+base+'&nbsp;'+basetype if application != "Ubuntu" else ''} | ${architectures} |
11 % endfor
12 % if application == "Ubuntu" and k == 1:
13-| _`16.04_stable`_ &nbsp;&nbsp; | - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
14-| _`14.04_stable`_ &nbsp;&nbsp; | - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) <br> until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
15+| _`16.04_stable`_ &nbsp;&nbsp; | - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2026 | Ubuntu Xenial Xerus 16.04 ESM | `amd64`, `arm`, `arm64`, `s390x`, `ppc64le` |
16+| _`14.04_stable`_ &nbsp;&nbsp; | - | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until 04-2024 | Ubuntu Trusty Tahr 14.04 ESM | `amd64`, `arm`, `arm64`, `s390x` , `ppc64le`|
17 % endif
18 | _`track_risk`_ |
19

Subscribers

People subscribed via source and target branches