Merge branch 'master' of github.com:KaveIO/KaveToolbox

KaveIO · Mar 13, 2017 · 463e438 · 463e438
2 parents 044ca7d + 85fefcd
commit 463e438
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/config/kaveinstall.py b/config/kaveinstall.py
@@ -188,6 +188,15 @@ def detect_linux_version():
                 return "Ubuntu16"
     except:
         pass
+    try:
+        status3, output3, err = mycmd("cat /etc/redhat-release")
+        if not status3 and "Centos" in output3:
+            if "release 6" in output3.lower():
+                return "Centos6"
+            if "release 7" in output3.lower():
+                return "Centos6"
+    except:
+        pass
     status, output, err = mycmd("uname -r")
     if status:
         raise RuntimeError("Problem detecting linux version: uname -r got:\n\t" + str(

diff --git a/docker/c7.workstation/Dockerfile b/docker/c7.workstation/Dockerfile
@@ -2,6 +2,12 @@
 FROM kave/kavetoolbox:3.1-Beta.c7.node
 MAINTAINER KAVE <kave@kpmg.com>
 RUN yum clean all
-RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.1-Beta/kavetoolbox-installer-3.1-Beta.sh
-RUN rm  -rf /opt/anaconda /opt/eclipse /opt/kettle
-RUN /bin/bash kavetoolbox-installer-3.1-Beta.sh --clean-before
+
+# hack linux version detection for windows builds (docker inconsistent!)
+RUN rm -f /opt/KaveToolbox/pro
+RUN mv /opt/KaveToolbox/3.0-Beta /opt/KaveToolbox_tmp
+RUN rm -rf /opt/KaveToolbox
+RUN sed -i 's/return output$/return "Centos7"\n/' /opt/KaveToolbox_tmp/config/kaveinstall.py 
+RUN /opt/KaveToolbox_tmp/scripts/KaveInstall
+RUN rm  -rf /opt/KaveToolbox_tmp
+
diff --git a/docker/u14.workstation/Dockerfile b/docker/u14.workstation/Dockerfile
@@ -2,6 +2,12 @@
 FROM kave/kavetoolbox:3.1-Beta.u14.node
 MAINTAINER KAVE <kave@kpmg.com>
 RUN apt-get update
-RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.1-Beta/kavetoolbox-installer-3.1-Beta.sh
-RUN rm  -rf /opt/anaconda /opt/eclipse /opt/kettle
-RUN /bin/bash kavetoolbox-installer-3.1-Beta.sh --clean-before
+
+# hack linux version detection for windows builds (docker inconsistent!)
+RUN rm -f /opt/KaveToolbox/pro
+RUN mv /opt/KaveToolbox/3.1-Beta /opt/KaveToolbox_tmp
+RUN rm -rf /opt/KaveToolbox
+RUN sed -i 's/return output$/return "Ubuntu14"\n/' /opt/KaveToolbox_tmp/config/kaveinstall.py 
+RUN /opt/KaveToolbox_tmp/scripts/KaveInstall
+RUN rm  -rf /opt/KaveToolbox_tmp
+
diff --git a/docker/u16.workstation/Dockerfile b/docker/u16.workstation/Dockerfile
@@ -2,6 +2,12 @@
 FROM kave/kavetoolbox:3.1-Beta.u16.node
 MAINTAINER KAVE <kave@kpmg.com>
 RUN apt-get update
-RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.1-Beta/kavetoolbox-installer-3.1-Beta.sh
-RUN rm  -rf /opt/anaconda /opt/eclipse /opt/kettle
-RUN /bin/bash kavetoolbox-installer-3.1-Beta.sh --clean-before
+
+# hack linux version detection for windows builds (docker inconsistent!)
+RUN rm -f /opt/KaveToolbox/pro
+RUN mv /opt/KaveToolbox/3.1-Beta /opt/KaveToolbox_tmp
+RUN rm -rf /opt/KaveToolbox
+RUN sed -i 's/return output$/return "Ubuntu16"\n/' /opt/KaveToolbox_tmp/config/kaveinstall.py 
+RUN /opt/KaveToolbox_tmp/scripts/KaveInstall
+RUN rm  -rf /opt/KaveToolbox_tmp
+