Commit 2359aa75 authored by Daniel Seybold's avatar Daniel Seybold

made download paths for jre and lance configurable

parent 0bbf2bcf
Pipeline #46664 passed with stage
in 7 minutes and 55 seconds
...@@ -104,7 +104,8 @@ colosseum.rmi.timeout = 180000 ...@@ -104,7 +104,8 @@ colosseum.rmi.timeout = 180000
colosseum.installer.download.threads = 1 colosseum.installer.download.threads = 1
# Java download path # Java download path
colosseum.installer.linux.java.download = "http://javadl.sun.com/webapps/download/AutoDL?BundleId=106240" #colosseum.installer.linux.java.download = "http://javadl.sun.com/webapps/download/AutoDL?BundleId=106240"
colosseum.installer.linux.java.download = "$CLOUDIATOR_JRE_DOWNLOAD"
colosseum.installer.windows.java.download = "http://javadl.sun.com/webapps/download/AutoDL?BundleId=107100" colosseum.installer.windows.java.download = "http://javadl.sun.com/webapps/download/AutoDL?BundleId=107100"
# 7ZIP download path, used for extracting binary zip distribution on windows. # 7ZIP download path, used for extracting binary zip distribution on windows.
...@@ -132,7 +133,8 @@ colosseum.installer.abstract.visor.config.chukwaUrl = "http://localhost:8080/chu ...@@ -132,7 +133,8 @@ colosseum.installer.abstract.visor.config.chukwaUrl = "http://localhost:8080/chu
colosseum.installer.abstract.visor.init = "" colosseum.installer.abstract.visor.init = ""
# Lance download path # Lance download path
colosseum.installer.abstract.lance.download = "https://omi-gitlab.e-technik.uni-ulm.de/dbms-jungle-explorer/dbms-catalogue-scripts/raw/master/lance/server-0.2.0-SNAPSHOT.jar" #colosseum.installer.abstract.lance.download = "https://omi-gitlab.e-technik.uni-ulm.de/dbms-jungle-explorer/dbms-catalogue-scripts/raw/master/lance/server-0.2.0-SNAPSHOT.jar"
colosseum.installer.abstract.lance.download = "$CLOUDIATOR_LANCE_DOWNLOAD"
#colosseum.installer.abstract.lance.download = "https://bintray.com/cloudiator/cloudiator/download_file?file_path=server-0.2.0-SNAPSHOT.jar" #colosseum.installer.abstract.lance.download = "https://bintray.com/cloudiator/cloudiator/download_file?file_path=server-0.2.0-SNAPSHOT.jar"
# Lance configuration options # Lance configuration options
colosseum.installer.abstract.lance.rmiPort = "1099" colosseum.installer.abstract.lance.rmiPort = "1099"
......
...@@ -13,7 +13,7 @@ GLOBAL_VAR="xyz" ...@@ -13,7 +13,7 @@ GLOBAL_VAR="xyz"
# validate if all container variables are set # validate if all container variables are set
############################################################################## ##############################################################################
function validate(){ function validate(){
vars="MYSQL_PW MYSQL_USER MYSQL_DB MYSQL_HOST ETCD_HOST PUBLIC_IP" vars="MYSQL_PW MYSQL_USER MYSQL_DB MYSQL_HOST ETCD_HOST PUBLIC_IP CLOUDIATOR_JRE_DOWNLOAD CLOUDIATOR_LANCE_DOWNLOAD"
for var in $vars; do for var in $vars; do
if [[ $(env | awk -F "=" '{print $1}' | grep "^$var$") != "$var" ]]; then if [[ $(env | awk -F "=" '{print $1}' | grep "^$var$") != "$var" ]]; then
echo "$var not set but required." echo "$var not set but required."
...@@ -37,6 +37,8 @@ function writeConfigOptions(){ ...@@ -37,6 +37,8 @@ function writeConfigOptions(){
export MYSQL_HOST=$MYSQL_HOST export MYSQL_HOST=$MYSQL_HOST
export ETCD_HOST=$ETCD_HOST export ETCD_HOST=$ETCD_HOST
export PUBLIC_IP=$PUBLIC_IP export PUBLIC_IP=$PUBLIC_IP
export CLOUDIATOR_JRE_DOWNLOAD=$CLOUDIATOR_JRE_DOWNLOAD
export CLOUDIATOR_LANCE_DOWNLOAD=$CLOUDIATOR_LANCE_DOWNLOAD
#cat /etc/docker-conf/configfile.conf.tmpl | envsubst > /etc/docker-conf/configfile.conf #cat /etc/docker-conf/configfile.conf.tmpl | envsubst > /etc/docker-conf/configfile.conf
cat /etc/docker-config/application.conf | envsubst > /opt/cloudiator/colosseum-0.2.0-SNAPSHOT/conf/application.conf cat /etc/docker-config/application.conf | envsubst > /opt/cloudiator/colosseum-0.2.0-SNAPSHOT/conf/application.conf
cp /etc/docker-config/logback.xml /opt/cloudiator/colosseum-0.2.0-SNAPSHOT/conf/ cp /etc/docker-config/logback.xml /opt/cloudiator/colosseum-0.2.0-SNAPSHOT/conf/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment