Fix #1412: Extract fromName from Dockerfile when build is Dockerfile …

…based (#1445) Fixes #1412
fabric8io · Dec 11, 2018 · a663d7b · a663d7b
1 parent d1a8ff6
commit a663d7b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ After this we will switch probably to real [Semantic Versioning 2.0.0](http://se
 ### 4.0.0-M2-SNAPSHOT
 * Fix 1326: Fixes overridding of Selector Label by the project enrichers entries.
 * Fix 839: Sets Spring Boot generator color config property as String (http://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/ansi/AnsiOutput.Enabled.html)
+* Fix 1412: mvn deploy fails when using a Dockerfile during S2I build
 * Fix 796: Remove workaround to produce both .yaml and .json files
 
 ### 3.5-SNAPSHOT

diff --git a/core/src/main/java/io/fabric8/maven/core/service/openshift/OpenshiftBuildService.java b/core/src/main/java/io/fabric8/maven/core/service/openshift/OpenshiftBuildService.java
@@ -302,10 +302,15 @@ private BuildStrategy createBuildStrategy(ImageConfiguration imageConfig, OpenSh
         } else if (osBuildStrategy == OpenShiftBuildStrategy.s2i) {
             BuildImageConfiguration buildConfig = imageConfig.getBuildConfiguration();
             Map<String, String> fromExt = buildConfig.getFromExt();
+            String fromName, fromKind, fromNamespace;
 
-            String fromName = getMapValueWithDefault(fromExt, OpenShiftBuildStrategy.SourceStrategy.name, buildConfig.getFrom());
-            String fromKind = getMapValueWithDefault(fromExt, OpenShiftBuildStrategy.SourceStrategy.kind, "DockerImage");
-            String fromNamespace = getMapValueWithDefault(fromExt, OpenShiftBuildStrategy.SourceStrategy.namespace, "ImageStreamTag".equals(fromKind) ? "openshift" : null);
+            if(buildConfig.isDockerFileMode()) {
+                fromName = extractBaseFromDockerfile(buildConfig, config.getDockerBuildContext());
+            } else {
+                fromName = getMapValueWithDefault(fromExt, OpenShiftBuildStrategy.SourceStrategy.name, buildConfig.getFrom());
+            }
+            fromKind = getMapValueWithDefault(fromExt, OpenShiftBuildStrategy.SourceStrategy.kind, "DockerImage");
+            fromNamespace = getMapValueWithDefault(fromExt, OpenShiftBuildStrategy.SourceStrategy.namespace, "ImageStreamTag".equals(fromKind) ? "openshift" : null);
 
             BuildStrategy buildStrategy = new BuildStrategyBuilder()
                     .withType("Source")