From faf0492638b16f0b720bbc4492cc48468516b2a4 Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 18:25:29 +0200 Subject: [PATCH 01/10] remove only what's really needed for update! --- docker/c7.workstation/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/c7.workstation/Dockerfile b/docker/c7.workstation/Dockerfile index 2bbcb9d..479d823 100644 --- a/docker/c7.workstation/Dockerfile +++ b/docker/c7.workstation/Dockerfile @@ -3,5 +3,5 @@ FROM kave/kavetoolbox:3.0-Beta.c7.node MAINTAINER KAVE RUN yum clean all RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.0-Beta/kavetoolbox-installer-3.0-Beta.sh -RUN rm -rf /opt/anaconda /opt/eclipse /opt/kettle -RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh --clean-before +RUN rm -rf /opt/KaveToolbox +RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh From 27a4922a537ad6a6927caa4adb14e16bd6727f57 Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 18:25:52 +0200 Subject: [PATCH 02/10] remove only what's really needed for update! --- docker/u14.workstation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/u14.workstation/Dockerfile b/docker/u14.workstation/Dockerfile index 8f36c70..307d288 100644 --- a/docker/u14.workstation/Dockerfile +++ b/docker/u14.workstation/Dockerfile @@ -3,5 +3,5 @@ FROM kave/kavetoolbox:3.0-Beta.u14.node MAINTAINER KAVE RUN apt-get update RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.0-Beta/kavetoolbox-installer-3.0-Beta.sh -RUN rm -rf /opt/anaconda /opt/eclipse /opt/kettle +RUN rm -rf /opt/KaveToolbox RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh --clean-before From 15efdbb51e9cdd8d84acddbb18644c82fbf75e8a Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 18:26:16 +0200 Subject: [PATCH 03/10] remove only what's really needed for update! --- docker/u16.workstation/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/u16.workstation/Dockerfile b/docker/u16.workstation/Dockerfile index 17e9040..e54f579 100644 --- a/docker/u16.workstation/Dockerfile +++ b/docker/u16.workstation/Dockerfile @@ -3,5 +3,5 @@ FROM kave/kavetoolbox:3.0-Beta.u16.node MAINTAINER KAVE RUN apt-get update RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.0-Beta/kavetoolbox-installer-3.0-Beta.sh -RUN rm -rf /opt/anaconda /opt/eclipse /opt/kettle -RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh --clean-before +RUN rm -rf /opt/KaveToolbox +RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh From 97b6ec771719c891aea194750ad8c40469fa3df8 Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 18:26:32 +0200 Subject: [PATCH 04/10] remove only what's really needed for update! --- docker/u14.workstation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/u14.workstation/Dockerfile b/docker/u14.workstation/Dockerfile index 307d288..3a487a5 100644 --- a/docker/u14.workstation/Dockerfile +++ b/docker/u14.workstation/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER KAVE RUN apt-get update RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.0-Beta/kavetoolbox-installer-3.0-Beta.sh RUN rm -rf /opt/KaveToolbox -RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh --clean-before +RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh From ef27b2ecdf0c1c380ab8eb6021989d4e5cb2be1e Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 21:28:20 +0200 Subject: [PATCH 05/10] More robust determination of OS flavour, now also use /etc/redhat-release if it exists --- config/kaveinstall.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/kaveinstall.py b/config/kaveinstall.py index feffae6..77c1ac8 100644 --- 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 status2 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( From cd21bb89602f59e289926e7ca9957d72941d3272 Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 21:28:59 +0200 Subject: [PATCH 06/10] statuscode check --- config/kaveinstall.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/kaveinstall.py b/config/kaveinstall.py index 77c1ac8..80a39f0 100644 --- a/config/kaveinstall.py +++ b/config/kaveinstall.py @@ -190,7 +190,7 @@ def detect_linux_version(): pass try: status3, output3, err = mycmd("cat /etc/redhat-release") - if not status2 and "Centos" in output3: + if not status3 and "Centos" in output3: if "release 6" in output3.lower(): return "Centos6" if "release 7" in output3.lower(): From 986ad937e4b7ef68c6afc99a0dd466485bd73912 Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 21:31:48 +0200 Subject: [PATCH 07/10] hack linux version detection for windows builds (docker inconsistent!) --- docker/c7.workstation/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/c7.workstation/Dockerfile b/docker/c7.workstation/Dockerfile index 479d823..b4fd17e 100644 --- a/docker/c7.workstation/Dockerfile +++ b/docker/c7.workstation/Dockerfile @@ -2,6 +2,10 @@ FROM kave/kavetoolbox:3.0-Beta.c7.node MAINTAINER KAVE RUN yum clean all -RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.0-Beta/kavetoolbox-installer-3.0-Beta.sh -RUN rm -rf /opt/KaveToolbox -RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh +# 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 -f /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 From 181d1ec02328de6341939171d5770bd8bd9ae02d Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 21:32:59 +0200 Subject: [PATCH 08/10] hack linux version detection for windows builds (docker inconsistent!) --- docker/u14.workstation/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/u14.workstation/Dockerfile b/docker/u14.workstation/Dockerfile index 3a487a5..3a954be 100644 --- a/docker/u14.workstation/Dockerfile +++ b/docker/u14.workstation/Dockerfile @@ -2,6 +2,10 @@ FROM kave/kavetoolbox:3.0-Beta.u14.node MAINTAINER KAVE RUN apt-get update -RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.0-Beta/kavetoolbox-installer-3.0-Beta.sh -RUN rm -rf /opt/KaveToolbox -RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh +# 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 "Ubuntu14"\n/' /opt/KaveToolbox_tmp/config/kaveinstall.py +RUN /opt/KaveToolbox_tmp/scripts/KaveInstall +RUN rm -rf /opt/KaveToolbox_tmp From 37401c9a8d3928a9dd4931894076a9ba517058db Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 21:33:37 +0200 Subject: [PATCH 09/10] hack linux version detection for windows builds (docker inconsistent!) --- docker/u16.workstation/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/u16.workstation/Dockerfile b/docker/u16.workstation/Dockerfile index e54f579..6dd7fe1 100644 --- a/docker/u16.workstation/Dockerfile +++ b/docker/u16.workstation/Dockerfile @@ -2,6 +2,10 @@ FROM kave/kavetoolbox:3.0-Beta.u16.node MAINTAINER KAVE RUN apt-get update -RUN wget http://repos:kaverepos@repos.dna.kpmglab.com/noarch/KaveToolbox/3.0-Beta/kavetoolbox-installer-3.0-Beta.sh -RUN rm -rf /opt/KaveToolbox -RUN /bin/bash kavetoolbox-installer-3.0-Beta.sh +# 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 "Ubuntu16"\n/' /opt/KaveToolbox_tmp/config/kaveinstall.py +RUN /opt/KaveToolbox_tmp/scripts/KaveInstall +RUN rm -rf /opt/KaveToolbox_tmp From 85fefcd562f4e290f55e39ef4b502eaf56b0ac40 Mon Sep 17 00:00:00 2001 From: "Dr. Rob Lambert, PhD" Date: Tue, 20 Sep 2016 21:33:51 +0200 Subject: [PATCH 10/10] hack linux version detection for windows builds (docker inconsistent!) --- docker/c7.workstation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/c7.workstation/Dockerfile b/docker/c7.workstation/Dockerfile index b4fd17e..1486211 100644 --- a/docker/c7.workstation/Dockerfile +++ b/docker/c7.workstation/Dockerfile @@ -5,7 +5,7 @@ RUN yum clean all # 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 -f /opt/KaveToolbox +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