Merge pull request #11 from 123FLO321/patch-1

Thank you for the contribution @123FLO321 

 * Introduce useful default tag name for MRs
 * Add imageTagPrefix and imageTagSuffix

"You can have *GitHub Docker* decide the tag of the image, and prepend or append something you like to it."

Author: matootie

README.md

@@ -28,6 +28,14 @@ Build and publish your repository as a Docker image and push it to GitHub Packag
 
 *Optional*. The desired tag for the image. Defaults to current branch or release version number.
 
+### `imageTagPrefix`
+
+*Optional*. Added to the beginning of the tag.
+
+### `imageTagSuffix`
+
+*Optional*. Added to the end of the tag.
+
 ### `buildArguments`
 
 *Optional*. Any additional build arguments to use when building the image.

action.yml

@@ -20,6 +20,12 @@ inputs:
   imageTag:
     description: "The desired tag for the image. Defaults to current branch or release version number."
     required: false
+  imageTagPrefix:
+    description: "Added to the beginning of the tag."
+    required: false
+  imageTagSuffix:
+    description: "Added to the end of the tag."
+    required: false
   buildArguments:
     description: "The build arguments for image."
     required: false

dist/index.js

@@ -693,7 +693,18 @@ async function run() {
     let imageTag = core.getInput('imageTag', { required: false });
     const ref = process.env['GITHUB_REF'];
     const refArray = ref.split('/');
-    if (!imageTag) imageTag = refArray[refArray.length - 1];
+    if (!imageTag) {
+        const refLast = refArray[refArray.length - 1];
+        if (refLast === "merge" && refArray.length >= 2) {
+            imageTag = "mr" + refArray[refArray.length - 2];
+        } else {
+            imageTag = refLast;
+        }
+    }
+    let imageTagPrefix = core.getInput('imageTagPrefix', { required: false });
+    if (imageTagPrefix) imageName = imageTagPrefix + imageName;
+    let imageTagSuffix = core.getInput('imageTagSuffix', { required: false });
+    if (imageTagSuffix) imageName = imageName + imageTagSuffix;
 
     // Set some variables.
     const imageURL = `docker.pkg.github.com/${repository}/${imageName}:${imageTag}`
@@ -1073,4 +1084,4 @@ exports.exec = exec;
 
 /***/ })
 
-/******/ });
+/******/ });