From 312555027e7ac1ab00c0f6dc74bc8d4fa23576e1 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Wed, 9 Sep 2020 15:01:34 +0800
Subject: [PATCH] update jupyter

---
 awx/docker-compose.yml     |  6 +++---
 jupyter/README.md          |  5 ++++-
 jupyter/docker-compose.yml |  3 ++-
 jupyter/nginx.conf         | 33 +++++++++++++++++++++++++++++++++
 polipo/README.md           |  1 +
 polipo/docker-compose.yml  |  1 +
 6 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 jupyter/nginx.conf

diff --git a/awx/docker-compose.yml b/awx/docker-compose.yml
index 69b38f5..0afe82b 100644
--- a/awx/docker-compose.yml
+++ b/awx/docker-compose.yml
@@ -1,5 +1,5 @@
 #
-# https://github.com/ansible/awx/blob/14.0.0/installer/roles/local_docker/templates/docker-compose.yml.j2
+# https://github.com/ansible/awx/blob/14.1.0/installer/roles/local_docker/templates/docker-compose.yml.j2
 #
 
 version: '2'
@@ -7,7 +7,7 @@ version: '2'
 services:
 
   web:
-    image: ansible/awx:14.0.0
+    image: ansible/awx:14.1.0
     container_name: awx_web
     hostname: awxweb
     user: root
@@ -29,7 +29,7 @@ services:
     restart: unless-stopped
 
   task:
-    image: ansible/awx:14.0.0
+    image: ansible/awx:14.1.0
     command: /usr/bin/launch_awx_task.sh
     container_name: awx_task
     hostname: awx
diff --git a/jupyter/README.md b/jupyter/README.md
index 2aa8a0c..cd548b4 100644
--- a/jupyter/README.md
+++ b/jupyter/README.md
@@ -5,9 +5,12 @@ Minimal Jupyter Notebook Stack
 
 ## docker-compose.yml
 
+[how to select an image](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/selecting.html)
+
 ```yaml
 notebook:
-  image: jupyter/minimal-notebook
+  image: jupyter/scipy-notebook
+  hostname: jupyter-notebook
   ports:
     - "8888:8888"
   volumes:
diff --git a/jupyter/docker-compose.yml b/jupyter/docker-compose.yml
index 420ab93..4885075 100644
--- a/jupyter/docker-compose.yml
+++ b/jupyter/docker-compose.yml
@@ -1,5 +1,6 @@
 notebook:
-  image: jupyter/minimal-notebook
+  image: jupyter/scipy-notebook
+  hostname: jupyter-notebook
   ports:
     - "8888:8888"
   volumes:
diff --git a/jupyter/nginx.conf b/jupyter/nginx.conf
new file mode 100644
index 0000000..6d42310
--- /dev/null
+++ b/jupyter/nginx.conf
@@ -0,0 +1,33 @@
+upstream jupyter_notebook {
+    server               127.0.0.1:8888;
+}
+
+server {
+    listen               80;
+    server_name          jupyter.example.com;
+    return               301 https://$host$request_uri;
+}
+
+server {
+    listen               443 ssl;
+    server_name          jupyter.example.com;
+
+    ssl_certificate      example.com.crt;
+    ssl_certificate_key  example.com.key;
+    ssl_protocols        TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers          HIGH:!aNULL:!MD5;
+
+    location / {
+        proxy_pass            http://jupyter_notebook;
+        proxy_set_header      Host $host;
+    }
+
+    location ~* /(api/kernels/[^/]+/(channels|iopub|shell|stdin)|terminals/websocket)/? {
+        proxy_pass            http://jupyter_notebook;
+        proxy_set_header      Host $host;
+        proxy_http_version    1.1;
+        proxy_set_header      Upgrade "websocket";
+        proxy_set_header      Connection "Upgrade";
+        proxy_read_timeout    86400;
+    }
+}
diff --git a/polipo/README.md b/polipo/README.md
index 39879cd..38f2a8f 100644
--- a/polipo/README.md
+++ b/polipo/README.md
@@ -16,6 +16,7 @@ services:
     command:
       authCredentials=username:password
       socksParentProxy=1.2.3.4:9050
+      dnsNameServer=8.8.8.8
     ports:
       - "8123:8123"
     restart: unless-stopped
diff --git a/polipo/docker-compose.yml b/polipo/docker-compose.yml
index a8afa28..50efd48 100644
--- a/polipo/docker-compose.yml
+++ b/polipo/docker-compose.yml
@@ -5,6 +5,7 @@ services:
     command:
       authCredentials=username:password
       socksParentProxy=1.2.3.4:9050
+      dnsNameServer=8.8.8.8
     ports:
       - "8123:8123"
     restart: unless-stopped