Merge branch '4024-pipeline-instances-scroll' of git.curoverse.com:arvados into 4024...

diff --git a/doc/install/index.html.textile.liquid b/doc/install/index.html.textile.liquid
index 227dd75b276995f05351aa42fc639f477016b525..500f6f6bd0eb97b4740a0a680e1ac05b97bb579a 100644 (file)
--- a/doc/install/index.html.textile.liquid
+++ b/doc/install/index.html.textile.liquid
@@ -18,6 +18,8 @@ This command will download the latest copy of the Arvados docker images. It also
 
 This installation method assumes your web browser and the Arvados docker containers run on the same host. 
 
+If you prefer, you can also download the installation script and inspect it before running it. The @http://get.arvados.org@ url redirects to <a href="https://raw.githubusercontent.com/curoverse/arvados-dev/master/install/easy-docker-install.sh">https://raw.githubusercontent.com/curoverse/arvados-dev/master/install/easy-docker-install.sh</a>, which is the installation script.
+
 h2. Installation from source
 
 It is also possible to build the Arvados docker images from source. The instructions are available "here":install-docker.html.

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 82c6424425460f59b5c361f99c1f0b1627a5b509..16244025994a001cba4d988c9ffe221948235098 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -95,27 +95,19 @@ def run(websockets=False, reuse_server=False):
         subprocess.call(['bundle', 'exec', 'rake', 'db:test:load'])
         subprocess.call(['bundle', 'exec', 'rake', 'db:fixtures:load'])
 
+        subprocess.call(['bundle', 'exec', 'rails', 'server', '-d',
+                         '--pid',
+                         os.path.join(os.getcwd(), SERVER_PID_PATH),
+                         '-p3000'])
+        os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3000"
+
         if websockets:
-            os.environ["ARVADOS_WEBSOCKETS"] = "true"
-            subprocess.call(['openssl', 'req', '-new', '-x509', '-nodes',
-                             '-out', './self-signed.pem',
-                             '-keyout', './self-signed.key',
-                             '-days', '3650',
-                             '-subj', '/CN=localhost'])
+            os.environ["ARVADOS_WEBSOCKETS"] = "ws-only"
             subprocess.call(['bundle', 'exec',
                              'passenger', 'start', '-d', '-p3333',
                              '--pid-file',
-                             os.path.join(os.getcwd(), WEBSOCKETS_SERVER_PID_PATH),
-                             '--ssl',
-                             '--ssl-certificate', 'self-signed.pem',
-                             '--ssl-certificate-key', 'self-signed.key'])
-            os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3333"
-        else:
-            subprocess.call(['bundle', 'exec', 'rails', 'server', '-d',
-                             '--pid',
-                             os.path.join(os.getcwd(), SERVER_PID_PATH),
-                             '-p3000'])
-            os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3000"
+                             os.path.join(os.getcwd(), WEBSOCKETS_SERVER_PID_PATH)
+                         ])
 
         pid = find_server_pid(SERVER_PID_PATH)