Fix eclipse-jkube#138: OpenShift build requires connection to dockerd

Remove check related to checking docker access in case of OpenShift builds
rohanKanojia · Apr 1, 2020 · af8a867 · af8a867
1 parent 7ecaea4
commit af8a867
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ Usage:
 ```
 ### 1.0.0-SNAPSHOT
 * Fix #130: Updated HelmMojo documentation
+* Fix #138: dockerAccessRequired should be false in case of docker build strategy
 
 ### 1.0.0-alpha-1 (2020-03-27)
 * Ported PR fabric8io/fabric8-maven-plugin#1792, NullCheck in FileDataSecretEnricher

diff --git a/...docker/src/main/java/org/eclipse/jkube/kit/build/core/assembly/DockerAssemblyManager.java b/...docker/src/main/java/org/eclipse/jkube/kit/build/core/assembly/DockerAssemblyManager.java
@@ -401,7 +401,7 @@ protected File ensureThatArtifactFileIsSet(JKubeProject project) throws IOExcept
 
     private void setArtifactFile(JKubeProject project, File artifactFile) throws IOException {
         if (artifactFile != null) {
-            File artifact = new File(project.getBuildDirectory() + artifactFile.getName());
+            File artifact = new File(project.getBuildDirectory(), artifactFile.getName());
             Files.copy(Paths.get(artifactFile.getAbsolutePath()), Paths.get(artifact.getAbsolutePath()), StandardCopyOption.REPLACE_EXISTING);
         }
     }

diff --git a/...in/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftBuildMojo.java b/...in/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftBuildMojo.java
@@ -35,9 +35,6 @@ protected boolean isDockerAccessRequired() {
         if (runtimeMode == kubernetes) {
              ret = true;
         }
-        if (buildStrategy == docker) {
-            ret = true;
-        }
         return ret;
     }
 

diff --git a/quickstarts/maven/webapp/pom.xml b/quickstarts/maven/webapp/pom.xml
@@ -38,6 +38,16 @@
         <artifactId>kubernetes-maven-plugin</artifactId>
         <version>${project.version}</version>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.jkube</groupId>
+        <artifactId>openshift-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+            <mode>openshift</mode>
+            <buildStrategy>docker</buildStrategy>
+            <verbose>true</verbose>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <properties>