Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:fix-single-element-versions into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:master

[Bryce Harrington]

Modify templates to be able to handle single-element versions, e.g. postgres:12-20.04.

[Sergio Durigan Junior (sergiodj)]

Ops, there are conflicts in the diff below.

From what I'm seeing the code LGTM, but just to be safe I think it's better to rebase the branch against master (there's one extra change on line 8 from README_DOCKERHUB.md which I'm not sure is intended). Thanks.

review: Needs Fixing

[Bryce Harrington (bryce)]

Thanks, I've updated the branch. I hadn't noticed that my checkout was out of date; guess it's good that the Makefile wgets the templates.

The line 8 change was just removing trailing whitespace from the line, but I've restored that to minimize this change.

[Sergio Durigan Junior (sergiodj)]

Ah, awesome. Thanks man, +1 from me.

review: Approve

diff --git a/templates/README_DOCKERHUB.md b/templates/README_DOCKERHUB.md
index c05871a..e66ca40 100644
--- a/templates/README_DOCKERHUB.md
+++ b/templates/README_DOCKERHUB.md
@@ -4,7 +4,8 @@ Current ${application} Docker Image from Ubuntu. Receives security updates and r
 <%
     baserepo='ubuntu'
     distroversion=base.strip('Ubuntu').strip('LTS').lstrip().rstrip()
-    pretag=version.split(".")[0]+'.'+version.split(".")[1]+'-'+distroversion+'_'
+    swver='.'.join(version.split(".")[:2])
+    pretag=swver+'-'+distroversion+'_'
     tag=pretag+'beta'
 %>
 <%include file="header.md" args="tag=tag, pretag=pretag, baserepo=baserepo, **locals()['pageargs']"/>
diff --git a/templates/README_DOCKERHUB_LTS.md b/templates/README_DOCKERHUB_LTS.md
index 4ae13f0..fadeee9 100644
--- a/templates/README_DOCKERHUB_LTS.md
+++ b/templates/README_DOCKERHUB_LTS.md
@@ -5,7 +5,8 @@ The [LTS Docker Image Portfolio](https://ubuntu.com/security/docker-images) are 
 <%
     baserepo='lts'
     distroversion=base.strip('Ubuntu').strip('LTS').lstrip().rstrip()
-    pretag=version.split(".")[0]+'.'+version.split(".")[1]+'-'+distroversion+'_'
+    swver='.'.join(version.split(".")[:2])
+    pretag=swver+'-'+distroversion+'_'
     tag=pretag+'beta'
 %>
 <%include file="header.md" args="tag=tag, pretag=pretag, baserepo=baserepo, **locals()['pageargs']"/>