Fix #1372: Plugin now resolves ARGs provided in BuildImageConfiguration #1373
Conversation
…nfiguration Refactored `DockerFileUtil.extractBaseImages` to accept a HashMap of Build args which would be passed from BuildService in order to resolve ARG values which are provided from plugin configuration
rohanKanojia
force-pushed
the
pr/issue1372
branch
from
fb1e91f to
f056fc5
Compare
There was a problem hiding this comment.
Thanks @rohanKanojia ! I will have a look now, and let's get that fix in ASAP.
I'm planning a release this weekend to fix some of the more pressing issues.
| 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))) { |
There was a problem hiding this comment.
I think spaces are also allowed here like in ${ foobar }. So for extracting the variable name it might be to user a regular expression. you then could also collapse the if statements into a single regular expression.
There was a problem hiding this comment.
I.e I think a REs like
^\$([^{}]+)$
^\$\{\s*([^{}\s]+)\s*\}$
would do the trick (not verified though)
There was a problem hiding this comment.
I'm trying out an arg with spaces like this in this Dockerfile:
ARG busyboxVersion
FROM busybox:${ busyboxVersion }When I trying to build it with docker, I'm getting an error:
docker : $ docker build -t test-dockerfile --build-arg busyboxVersion=latest .
Sending build context to Docker daemon 3.072 kB
Error response from daemon: Dockerfile parse error line 2: FROM requires either one or three arguments
|
@rohanKanojia let's get it merged now to fix the issue at hand, but would love to allow also variables provided in an extended way (as mentioned in the pr comments) |
Use regex in order to resolve ARG value
Use regex in order to resolve ARG value
Use regex in order to resolve ARG value
Fix #1372
Refactored
DockerFileUtil.extractBaseImagesto accept a HashMap ofBuild args which would be passed from BuildService in order to resolve
ARG values which are provided from plugin configuration