update deploy.cfg and Dockerfile

Author: dcchivian

Dockerfile

@@ -6,21 +6,27 @@ MAINTAINER KBase Developer
 # install line here, a git checkout to download code, or run any other
 # installation scripts.
 
-# RUN apt-get update
+# Update certs
+RUN apt-get update
+RUN apt-get install ca-certificates
+
+# Fix Python SSL warnings for python < 2.7.9 (system python on Trusty is 2.7.6)
+# https://github.com/pypa/pip/issues/4098
+RUN pip install pip==8.1.2
+RUN pip install --disable-pip-version-check requests requests_toolbelt pyopenssl --upgrade
+
+## update security libraries in the base image (deprecated approach)
+#RUN pip install cffi --upgrade \
+#    && pip install pyopenssl --upgrade \
+#    && pip install ndg-httpsclient --upgrade \
+#    && pip install pyasn1 --upgrade \
+#    && pip install requests --upgrade \
+#    && pip install 'requests[security]' --upgrade
 
 # Here we install a python coverage tool and an
 # https library that is out of date in the base image.
-
 RUN pip install coverage
 
-# update security libraries in the base image
-RUN pip install cffi --upgrade \
-    && pip install pyopenssl --upgrade \
-    && pip install ndg-httpsclient --upgrade \
-    && pip install pyasn1 --upgrade \
-    && pip install requests --upgrade \
-    && pip install 'requests[security]' --upgrade
-
 # -----------------------------------------
 
 COPY ./ /kb/module

deploy.cfg

@@ -3,9 +3,22 @@ kbase-endpoint = {{ kbase_endpoint }}
 job-service-url = {{ job_service_url }}
 workspace-url = {{ workspace_url }}
 shock-url = {{ shock_url }}
+{% if handle_url %}
 handle-service-url = {{ handle_url }}
-srv-wiz-url = {{ srv_wiz_url }}
+{% else %}
+handle-service-url = {{ kbase_endpoint }}/handle_service
+{% endif %}
+{% if srv_wiz_url %}
+service-wizard-url = {{ srv_wiz_url }}
+{% else %}
+service-wizard-url = {{ kbase_endpoint }}/service_wizard
+{% endif %}
 njsw-url = {{ njsw_url }}
+{% if auth_service_url %}
 auth-service-url = {{ auth_service_url }}
+{% endif %}
+{% if auth_service_url_allow_insecure %}
 auth-service-url-allow-insecure = {{ auth_service_url_allow_insecure }}
+{% endif %}
 scratch = /kb/module/work/tmp
+mac-test-mode = 0