changeset 159:616da104a996

fix for ubuntu 18.04
author am@osimis.io
date Fri, 17 Aug 2018 14:49:59 +0200
parents df1f9946571c
children 6995d5d12d88
files PerfsDb/ConfigFileBuilder.py PerfsDb/README.md
diffstat 2 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/PerfsDb/ConfigFileBuilder.py	Fri Aug 17 11:58:26 2018 +0200
+++ b/PerfsDb/ConfigFileBuilder.py	Fri Aug 17 14:49:59 2018 +0200
@@ -1,6 +1,7 @@
 import typing
 import json
 import os
+import platform
 
 from DbType import DbType
 
@@ -52,7 +53,12 @@
             config["Plugins"] = [os.path.join(pluginsPath, "libOrthancMsSqlIndex.so")]
             dbConfig["EnableStorage"] = False
 
-            dbConfig["ConnectionString"] = "Driver={ODBC Driver 13 for SQL Server};Server=tcp:127.0.0.1," + str(port) + ";Database=master;Uid=sa;Pwd=MyStrOngPa55word!;Encrypt=yes;TrustServerCertificate=yes;Connection Timeout=30"
+            if platform.node() == "benchmark":   # the benchmark VM on Azure is a 18.04 -> it has version 17
+                odbcVersion = 17
+            else:
+                odbcVersion = 13
+
+            dbConfig["ConnectionString"] = "Driver={ODBC Driver " + str(odbcVersion) + " for SQL Server};Server=tcp:127.0.0.1," + str(port) + ";Database=master;Uid=sa;Pwd=MyStrOngPa55word!;Encrypt=yes;TrustServerCertificate=yes;Connection Timeout=30"
             dbConfig["LicenseString"] = "1abaamBcReVXv6EtE_X___demo-orthanc%osimis.io___HHHnqVHYvEkR3jGs2Y3EvpbxZgTt7yaCniJa2Bz7hFWTMa" # note: this is a trial license expiring on 2018-09-30, replace with your license code
 
             config["MSSQL"] = dbConfig
--- a/PerfsDb/README.md	Fri Aug 17 11:58:26 2018 +0200
+++ b/PerfsDb/README.md	Fri Aug 17 14:49:59 2018 +0200
@@ -22,6 +22,11 @@
 Prerequisites
 -------------
 
+- install standard tools
+```bash
+sudo apt-get install -y mercurial wget curl
+```
+
 - install python3, pip3 and pipenv
 
 ```bash
@@ -29,7 +34,6 @@
 ```
 
 - [install Docker-CE](https://docs.docker.com/install/linux/docker-ce/ubuntu/#set-up-the-repository)
-- [install docker-compose](https://docs.docker.com/compose/install/)
 - have access to docker without typing `sudo`.  This is done by typing: `sudo groupadd docker` and `sudo usermod -aG docker $USER`
 - have Orthanc and its DB plugins natively installed or compiled on your host system
 
@@ -66,4 +70,7 @@
 
 ```bash
 python Run.py --orthanc-path=/home/amazy/builds/orthanc-build-release/ --plugins-path=/home/amazy/builds/orthanc-build-release/ --run --pg9-tiny --pg10-tiny --pg11-tiny --mysql-tiny --sqlite-tiny --mssql-tiny
+
+python Run.py --orthanc-path=/data/orthanc-binaries/ --plugins-path=/data/orthanc-binaries/ --run --pg9-tiny --pg10-tiny --pg11-tiny --mysql-tiny --sqlite-tiny --mssql-tiny
+
 ```