Merge pull request #179 from jfdenise/CLOUD-3607

[0.18.x] Fix for CLOUD-3607, Move Image Builder non maven repo content out of tmp
wildfly · Aug 25, 2020 · 91f1a69 · 91f1a69
2 parents b8da0a8 + d240394
commit 91f1a69
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/jboss/container/wildfly/galleon/build-feature-pack/configure.sh b/jboss/container/wildfly/galleon/build-feature-pack/configure.sh
@@ -39,7 +39,12 @@ if [ -f "${ZIPPED_REPO}" ]; then
     sh $GALLEON_MAVEN_REPO_HOOK_SCRIPT "$repoDir"
   fi
   mv $repoDir/maven-repository "$TMP_GALLEON_LOCAL_MAVEN_REPO"
-
+  mkdir "$JBOSS_CONTAINER_WILDFLY_S2I_GALLEON_DIR/maven-repo-misc"
+  if [ "$(ls -A $repoDir)" ]; then
+    mv $repoDir/* "$JBOSS_CONTAINER_WILDFLY_S2I_GALLEON_DIR/maven-repo-misc"
+  fi
+  rm -rf $repoDir
+
   if [ "x$deleteBuildArtifacts" == "xtrue"  ]; then
     echo "Build artifacts are not kept, will be removed from galleon local cache"
     cp -r $TMP_GALLEON_LOCAL_MAVEN_REPO $GALLEON_LOCAL_MAVEN_REPO