Remove SCITRAN_RUNTIME_PROTOCOL

This variable was a temporary measure from https://github.com/scitran/core/pull/190 and never fully removed until now.

docker/README.md

@@ -38,9 +38,7 @@ preserving their contents across container instances.
 
 # Bootstrap Account Example:
    docker run \
-     -e "SCITRAN_RUNTIME_HOST=scitran-core" \
-     -e "SCITRAN_RUNTIME_PORT=8080" \
-     -e "SCITRAN_RUNTIME_PROTOCOL=http" \
+     -e "SCITRAN_SITE_API_URL=http://scitran-core:8080/api" \
      -e "SCITRAN_CORE_DRONE_SECRET=change-me" \
      --link scitran-core \
      --rm \
@@ -52,9 +50,7 @@ preserving their contents across container instances.
 
 # Bootstrap Data Example:
    docker run \
-     -e "SCITRAN_RUNTIME_HOST=scitran-core" \
-     -e "SCITRAN_RUNTIME_PORT=8080" \
-     -e "SCITRAN_RUNTIME_PROTOCOL=http" \
+     -e "SCITRAN_SITE_API_URL=http://scitran-core:8080/api" \
      -e "SCITRAN_CORE_DRONE_SECRET=change-me" \
      -e "PRE_RUNAS_CMD=/var/scitran/code/api/docker/bootstrap-data.sh" \
      --link scitran-core \

docker/bootstrap-accounts.sh

@@ -21,11 +21,8 @@ cd /var/scitran/code/api
 export PYTHONPATH=.
 
 
-# Set API URL
-API_URL="$SCITRAN_RUNTIME_PROTOCOL://$SCITRAN_RUNTIME_HOST:$SCITRAN_RUNTIME_PORT/api"
-
 # Bootstrap Users
-./bin/bootstrap.py --insecure --secret "${SCITRAN_CORE_DRONE_SECRET}" "${API_URL}" "${bootstrap_user_file}"
+./bin/bootstrap.py --insecure --secret "${SCITRAN_CORE_DRONE_SECRET}" "${SCITRAN_SITE_API_URL}" "${bootstrap_user_file}"
 
 
 )

docker/bootstrap-data.sh

@@ -71,10 +71,7 @@ builtin echo "$TESTDATA_VERSION" > "$TESTDATA_DIR/.testdata_version"
 pip install "git+https://github.com/scitran/reaper.git@${bootstrap_reaper_label}"
 
 
-# Set API URL
-API_URL="$SCITRAN_RUNTIME_PROTOCOL://$SCITRAN_RUNTIME_HOST:$SCITRAN_RUNTIME_PORT/api"
-
 ## load the test data in
-folder_uploader --insecure --secret "${SCITRAN_CORE_DRONE_SECRET}" "${API_URL}" "$TESTDATA_DIR/download"
+folder_uploader --insecure --secret "${SCITRAN_CORE_DRONE_SECRET}" "${SCITRAN_SITE_API_URL}" "$TESTDATA_DIR/download"
 
 )

sample.config

@@ -2,7 +2,6 @@
 
 #SCITRAN_RUNTIME_HOST="127.0.0.1"
 #SCITRAN_RUNTIME_PORT="8080"
-#SCITRAN_RUNTIME_PROTOCOL="https"
 #SCITRAN_RUNTIME_PATH="./runtime"
 #SCITRAN_RUNTIME_SSL_PEM="*"
 #SCITRAN_RUNTIME_BOOTSTRAP="bootstrap.json"