Merge pull request #28 from sileht/ci-fix

fix: jupiter don't need to be rewritten
jolibrain · Sep 18, 2020 · 7367e74 · 7367e74
2 parents b544462 + 29d80fa
commit 7367e74
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/ci/run.sh b/ci/run.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+set -x
 set -o pipefail
 
 export MODE=$1
@@ -18,5 +19,7 @@ CURRENT_UID=$(id -u):$(id -g) MUID=$(id -u) docker-compose -p $PROJECT up -d
 
 PORT=$(docker port "${PROJECT}_platform_ui_1" 80/tcp | awk -F: '{print $2}')
 
+timeout 22 sh -c "until nc -z localhost $PORT; do sleep 1; done"
+
 curl -s --head --request GET localhost:$PORT | head -1 | grep 'HTTP/1.1 200'
 curl -s --head --request GET http://localhost:$PORT/filebrowser/sw.js | head -1 | grep 'HTTP/1.1 200'
diff --git a/code/cpu/config/filebrowser/database.db b/code/cpu/config/filebrowser/database.db
diff --git a/code/cpu/config/nginx/nginx.conf b/code/cpu/config/nginx/nginx.conf
@@ -109,7 +109,6 @@ http {
     }
 
     location ~* /code/(api/kernels/[^/]+/(channels|iopub|shell|stdin)|terminals/websocket)/? {
-      rewrite ^/code/(.*) /$1 break;
 
       proxy_pass $jupyter;
 

diff --git a/code/gpu/config/nginx/nginx.conf b/code/gpu/config/nginx/nginx.conf
@@ -115,7 +115,6 @@ http {
     }
 
     location ~* /code/(api/kernels/[^/]+/(channels|iopub|shell|stdin)|terminals/websocket)/? {
-      rewrite ^/code/(.*) /$1 break;
       proxy_pass $jupyter;
 
       proxy_set_header X-Real-IP $remote_addr;
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,6 @@ http { @@
         }
         location ~* /code/(api/kernels/[^/]+/(channels|iopub|shell|stdin)|terminals/websocket)/? {
-          rewrite ^/code/(.*) /$1 break;
           proxy_pass $jupyter;
@@ Expand Down @@