From 7fac9ba5b1a48ddaf1022504751aa1a2deb6ebc8 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 3 Dec 2020 15:37:51 +0100
Subject: [PATCH] Removed ad-hoc requirements installation as we now use our
custom docker images for itango
---
tools/itango/install_requirements-DS.sh | 20 ------------------
tools/itango/itango_console-requirements.txt | 2 --
tools/itango/itango_console.sh | 22 ++------------------
tools/itango/itango_shell.sh | 3 ++-
tools/itango/start-DS.sh | 6 ------
5 files changed, 4 insertions(+), 49 deletions(-)
delete mode 100755 tools/itango/install_requirements-DS.sh
delete mode 100644 tools/itango/itango_console-requirements.txt
diff --git a/tools/itango/install_requirements-DS.sh b/tools/itango/install_requirements-DS.sh
deleted file mode 100755
index c5fb3851b..000000000
--- a/tools/itango/install_requirements-DS.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-if [ ${#} -ne 1 ]; then
- echo "The 1st parameter must be the requirements.txt file."
- exit -1
-fi
-
-# Find the path to the device server's requirements.txt file
-# on the Docker's host but relative to the /hosthome directory
-# in Docker the user's # mounted ${HOME}).
-# ATTENTION
-# This is assuming that the device server's requirements.txt file
-# exists # on the Docker's host in the user's ${HOME} directory.
-requirements=$(basename ${1})
-echo ${requirements}
-if [ -f ${requirements} ]; then
- myDir=${PWD}
-else
- myDir=${PWD}/$(dirname ${1})
-fi
-requirementsPath=${myDir//${HOME}\//\/hosthome\/}
-docker exec -it itango python3 -m pip install -r ${requirementsPath}/${requirements}
diff --git a/tools/itango/itango_console-requirements.txt b/tools/itango/itango_console-requirements.txt
deleted file mode 100644
index 608b6af59..000000000
--- a/tools/itango/itango_console-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-opcua >= 0.98.9
-astropy
diff --git a/tools/itango/itango_console.sh b/tools/itango/itango_console.sh
index 5f5686138..fb4c9b8a2 100755
--- a/tools/itango/itango_console.sh
+++ b/tools/itango/itango_console.sh
@@ -1,20 +1,2 @@
-# Find the path to this file that is relative to the
-# /hosthome directory (in Docker the user's mounted ${HOME}).
-# ATTENTION
-# This is assuming that the this file exists
-# on the Docker's host in the user's ${HOME} directory.
-runThis=$(basename ${0})
-if [ -f ${runThis} ]; then
- myDir=${PWD}
-else
- myDir=${PWD}/$(dirname ${0})
-fi
-requirements=${runThis%%.sh}-requirements.txt
-thisScriptPath=${myDir/${HOME}/\/hosthome}
-if [ -f ${myDir}/${requirements} ]; then
- echo "Installing required Python modules with pip3..."
- docker exec -it itango pip3 install -r ${thisScriptPath}/${requirements}
- echo "Installing required Python modules with pip3 done."
-fi
-
-docker exec -it itango itango3
+#!/bin/bash
+exec docker exec -it itango itango3
diff --git a/tools/itango/itango_shell.sh b/tools/itango/itango_shell.sh
index cf1495766..abab9ef85 100755
--- a/tools/itango/itango_shell.sh
+++ b/tools/itango/itango_shell.sh
@@ -1 +1,2 @@
-docker exec -it itango /bin/bash
+#!/bin/bash
+exec docker exec -it itango /bin/bash
diff --git a/tools/itango/start-DS.sh b/tools/itango/start-DS.sh
index 90ea2e465..c6b32eccf 100755
--- a/tools/itango/start-DS.sh
+++ b/tools/itango/start-DS.sh
@@ -36,11 +36,5 @@ if [ -f ${runThis} ]; then
else
myDir=${PWD}/$(dirname ${deviceServer})
fi
-deviceServerPath=${myDir/${HOME}/\/hosthome}
-if [ -f ${myDir}/requirements.txt ]; then
- echo "Installing required Python modules with pip3..."
- docker exec -it itango pip3 install -r ${deviceServerPath}/requirements.txt
- echo "Installing required Python modules with pip3 done."
-fi
docker exec -it itango python3 ${deviceServerPath}/${runThis} ${instance} ${@}
--
GitLab