Handle properly when dockerFile and dockerFileDir also set #624
Conversation
There was a problem hiding this comment.
Actually it makes sense to help people if they want to provide both parameters, but in general it is easier to use a dockerFile only with an absolute path.
Its not really clear what's the advantage of providing both, but since this doesn't harm either, its perfectly fine for me to merge this in.
Thanks !
| @@ -457,7 +457,10 @@ public String initAndValidate(Logger log) throws IllegalArgumentException { | |||
|
|
|||
| // Initialize the dockerfile location and the build mode | |||
| private void initDockerFileFile(Logger log) { | |||
| if (dockerFile != null) { | |||
| if (dockerFile != null && dockerFileDir != null) { | |||
| dockerFileFile = new File(dockerFileDir, dockerFile); | |||
There was a problem hiding this comment.
Could you please add a check, that dockerFile is not an absolute path and throw an error if it is ?
lmesz
force-pushed
the
fix_dockerFile_dockerFileDir
branch
from
5ea81cd
to
ebf131b
Compare
|
Added check for absolutepath that you asked :) |
|
May I ask if it will be merged or not? |
|
@lmesz sorry, I'm bit work overflowed, but I will add it asap when I have the next free cycles. I've one conference next week, but after this things should calm down considerably. |
|
@lmesz next week I have dedicated some cycles to docker-maven-plugin and will integrate you PR then. Thanks for your patience ... |
…kerFileDir also set Signed-off-by: Laszlo Meszaros <lacienator@gmail.com>
lmesz
force-pushed
the
fix_dockerFile_dockerFileDir
branch
from
ebf131b
to
5de287a
Compare
|
Sure, you mean changelog or the documentation itself? Where can I find the documentation from which the user guide created? |
Current coverage is 47.42% (diff: 100%)@@ master #624 diff @@
==========================================
Files 113 113
Lines 5881 5887 +6
Methods 0 0
Messages 0 0
Branches 1020 1022 +2
==========================================
+ Hits 2786 2792 +6
Misses 2850 2850
Partials 245 245
|
lmesz
force-pushed
the
fix_dockerFile_dockerFileDir
branch
from
5de287a
to
761448b
Compare
Also streamlined the load image functionality. This includes the code from fabric8io#624 and fixes fabric8io#624
When both parameter set the dockerFileDir was ignored because of the logic how to find the given dockerfile.
After the pull request when both parameter set docker-maven-plugin determine properly the location of the Dockerfile.