Merge #1078

1078: Fix custom image names for images with a trailing '-' character. r=Emilgardis a=Alexhuszagh

Closes #1077.

Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>

Author: bors[bot]

.changes/1078.json

@@ -0,0 +1,5 @@
+{
+    "type": "fixed",
+    "description": "Fix custom image names for images with a trailing '-' character.\ncustom images in packages with the `^[^0-9-].*([^A-Za-z_]*-)|(-[^A-Za-z_]*)$` package name pattern are now supported.",
+    "issues": [1077]
+}

src/docker/custom.rs

@@ -259,7 +259,7 @@ fn docker_tag_name(file_name: &str) -> String {
     let mut consecutive_underscores = 0;
     for c in file_name.chars() {
         match c {
-            'a'..='z' | '.' | '-' => {
+            'a'..='z' | '0'..='9' | '.' | '-' => {
                 consecutive_underscores = 0;
                 result.push(c);
             }
@@ -278,7 +278,11 @@ fn docker_tag_name(file_name: &str) -> String {
         }
     }
 
-    // in case all characters were invalid, use a non-empty filename
+    // in case all characters were invalid or we had all non-ASCII
+    // characters followed by a `-`, we use a non-empty filename
+    if result.ends_with('-') {
+        result.pop();
+    }
     if result.is_empty() {
         result = "empty".to_owned();
     }
@@ -312,5 +316,8 @@ mod tests {
             docker_tag_name("pAcKaGe---test.name"),
             s!("package---test.name")
         );
+
+        assert_eq!(docker_tag_name("foo-123"), s!("foo-123"));
+        assert_eq!(docker_tag_name("foo-123-"), s!("foo-123"));
     }
 }