Follow up PR for #1373

Use regex in order to resolve ARG value
fabric8io · Sep 28, 2020 · bc9f71a · bc9f71a
1 parent 207c0f3
commit bc9f71a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/io/fabric8/maven/docker/util/DockerFileUtil.java b/src/main/java/io/fabric8/maven/docker/util/DockerFileUtil.java
@@ -166,10 +166,14 @@ static Map<String, String> extractArgsFromLines(List<String[]> argLines, Map<Str
     }
 
     static String resolveArgValueFromStrContainingArgKey(String argString, Map<String, String> args) {
-        if (argString.startsWith("$") && args.containsKey(argString.substring(1))) {
-            return args.get(argString.substring(1));
-        } else if (argString.startsWith("${") && argString.endsWith("}") && args.containsKey(argString.substring(2, argString.length() - 1))) {
-            return args.get(argString.substring(2, argString.length() - 1));
+        Pattern argPattern = Pattern.compile("\\$(?:\\{(.*)\\}|(.*))");
+        Matcher matcher = argPattern.matcher(argString);
+        if (matcher.find()) {
+            if (matcher.group(1) != null) {
+                return args.get(matcher.group(1));
+            } else if (matcher.group(2) != null) {
+                return args.get(matcher.group(2));
+            }
         }
         return null;
     }