Correct - to _ in orchestrate arguments

Author: bdevans

Makefile

@@ -78,16 +78,15 @@ token:
 #proxy: proxy-image token
 proxy:
 	docker run --net=host -d -e CONFIGPROXY_AUTH_TOKEN=$(TOKEN) --name proxy \
-		jupyter/configurable-http-proxy \
-		--default-target http://$(DOCKER_HOST):9999
+		jupyter/configurable-http-proxy --default-target http://$(DOCKER_HOST):9999
 
 #tmpnb: tmpnb-image token
 tmpnb:
 	docker run --net=host -d -e CONFIGPROXY_AUTH_TOKEN=$(TOKEN) --name tmpnb \
 		-v /var/run/docker.sock:/docker.sock jupyter/tmpnb python orchestrate.py \
 		--image=$(DEMO_IMAGE) --cull_timeout=$(CULL_TIMEOUT) --cull_period=$(CULL_PERIOD) \
 		--pool_size=$(POOL_SIZE) --cull_max=$(CULL_MAX) \
-		--redirect-uri="/notebooks/Prometheus.ipynb" \
+		--redirect_uri="/notebooks/Prometheus.ipynb" \
 		--command="jupyter notebook --NotebookApp.base_url={base_path} --ip=0.0.0.0 --port {port} --no-browser"
 # --logging=$(LOGGING)
 
@@ -105,9 +104,9 @@ run:
     -e CONFIGPROXY_ENDPOINT=http://$(DOCKER_HOST):8001 \
     -v /var/run/docker.sock:/docker.sock \
     jupyter/tmpnb python orchestrate.py --image=$(DEMO_IMAGE) \
-		--pool-size=$(POOL_SIZE) --mem-limit=$(MEM_LIMIT) --cpu-shares=$(CPU_SHARES) \
-    --cull-timeout=$(CULL_TIMEOUT) --cull_period=$(CULL_PERIOD) --cull_max=$(CULL_MAX) \
-    --redirect-uri="/notebooks/Prometheus.ipynb" \
+		--pool_size=$(POOL_SIZE) --mem_limit=$(MEM_LIMIT) --cpu_shares=$(CPU_SHARES) \
+    --cull_timeout=$(CULL_TIMEOUT) --cull_period=$(CULL_PERIOD) --cull_max=$(CULL_MAX) \
+    --redirect_uri="/notebooks/Prometheus.ipynb" \
     --command="jupyter notebook --NotebookApp.base_url={base_path} --ip=0.0.0.0 --port {port} --no-browser"
 
 go: redirect token proxy tmpnb image

notes.txt

@@ -0,0 +1,79 @@
+sudo docker pull nginx
+sudo docker run --name docker-nginx -p 80:80 nginx
+# Detached mode
+sudo docker run --name docker-nginx -p 80:80 -d nginx
+sudo docker ps
+sudo docker stop docker-nginx
+sudo docker ps -a
+mkdir html
+cp index.html html
+docker run --name docker-nginx -p 80:80 -v ~/html:/usr/share/nginx/html -d nginx
+
+# -v ~/docker-nginx/default.conf:/etc/nginx/conf.d/default.conf
+
+# Dockerfile
+#FROM nginx
+#ADD nginx.conf /etc/nginx/nginx.conf
+
+
+docker pull jupyter/minimal-notebook
+export TOKEN=$( head -c 30 /dev/urandom | xxd -p )
+docker run --net=host -d -e CONFIGPROXY_AUTH_TOKEN=$TOKEN --name=proxy jupyter/configurable-http-proxy --default-target http://127.0.0.1:9999
+docker run --net=host -d -e CONFIGPROXY_AUTH_TOKEN=$TOKEN --name=tmpnb -v /var/run/docker.sock:/docker.sock jupyter/tmpnb
+
+
+iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to 8000
+docker run -d --name configproxy --net=host -e CONFIGPROXY_AUTH_TOKEN=LEGIT_KEY jupyter/configurable-http-proxy --default-target http://127.0.0.1:9999
+docker run -d --name tmpnb --net=host -e CONFIGPROXY_AUTH_TOKEN=LEGIT_KEY -v /var/run/docker.sock:/docker.sock jupyter/tmpnb python orchestrate.py --cull-timeout=120 --docker-version=1.13 --pool-size=512 --image=jupyter/demo --static-files=/srv/ipython/IPython/html/static/ --redirect-uri=/tree --command='ipython3 notebook --NotebookApp.base_url={base_path}' --max-dock-workers=8
+
+tmpnb nginx setup
+
+This host should have its own DNS record for the redirector to point to, e.g. yetanother.tmpnb.org
+
+apt-get update && apt-get upgrade -y && apt-get install nginx
+mkdir -p /var/www/tmpnb-static && cd /var/www/tmpnb-static
+# Grab the static.tar *somehow*
+tar -xvf static.tar
+
+# Grab the nginx configuration *somehow*
+cp nginx.conf /etc/nginx/sites-available/default
+# Change the nginx configuration to point to the tmpnb node that this server goes with
+
+# Put the certs in `/etc/ssl`
+
+service nginx restart
+
+
+https://raw.githubusercontent.com/ProjectPyRhO/PyRhO/master/pyrho/gui/PyRhO_logo.png
+
+# Original ga.html
+# Differences (apart from UA)
+- missing https: before //www.google-analytics.com/analytics.js
+- has an extra line: ga('require', 'displayfeatures');
+
+<script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-56096826-1', 'auto');
+    ga('require', 'displayfeatures');
+    ga('send', 'pageview');
+</script>
+
+# Do I copy in templates? static? where? how are they included?
+# Do I still need a jupyter_notebook_config.py ? This might be for JupyterHub - see issue 379
+# Does orchestrate handle all the templates now? --NotebookApp.base_url={base_path} --NotebookApp.trust_xheaders=True"
+
+docker run -d \
+    --net=host \
+    -e CONFIGPROXY_AUTH_TOKEN=$TOKEN \
+    -v /var/run/docker.sock:/docker.sock \
+    jupyter/tmpnb \
+    python orchestrate.py --image='jupyter/minimal-notebook' \
+        --command='start-notebook.sh \
+            "--NotebookApp.base_url={base_path} \
+            --ip=0.0.0.0 \
+            --port={port} \
+            --NotebookApp.trust_xheaders=True"'