From 8744690e02f40ccfee9d75a57b353fcab2c8236f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 18 May 2020 01:21:52 +0000 Subject: [PATCH] adding bash scripts for docker, websocket using wss and file upload on https, still getting 400 error on exhibit add_image --- app/main.py | 2 +- app/templates/edit_exhibit.html | 2 +- start_docker | 25 +++++++++++++++++++++++++ stop_docker | 8 ++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100755 start_docker create mode 100755 stop_docker diff --git a/app/main.py b/app/main.py index 067170d..f2f2e69 100644 --- a/app/main.py +++ b/app/main.py @@ -18,7 +18,7 @@ app = FastAPI() -app.add_middleware(HTTPSRedirectMiddleware) +#app.add_middleware(HTTPSRedirectMiddleware) app_path = Path.cwd() static_path = app_path / "site" / "assets" diff --git a/app/templates/edit_exhibit.html b/app/templates/edit_exhibit.html index 182f07e..48e4f58 100644 --- a/app/templates/edit_exhibit.html +++ b/app/templates/edit_exhibit.html @@ -173,7 +173,7 @@

Edit Item

if (typeof files !== "undefined") { fd.append('file',files); fd.append('filename', files.name); - request.open("POST", "http://{{ meta.url }}/item_images"); + request.open("POST", "https://{{ meta.url }}/item_images"); request.send(fd); let ur = request.response; let url = ur.slice(2,-2); diff --git a/start_docker b/start_docker new file mode 100755 index 0000000..4de61b2 --- /dev/null +++ b/start_docker @@ -0,0 +1,25 @@ +docker build -t blini . +docker run -d -p 80:80 -p 443:443 \ + --name nginx-proxy \ + -v $HOME/certs:/etc/nginx/certs:ro \ + -v /etc/nginx/vhost.d \ + -v /usr/share/nginx/html \ + -v /var/run/docker.sock:/tmp/docker.sock:ro \ + --label com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true \ + jwilder/nginx-proxy + +docker run -d \ + --name nginx-letsencrypt \ + --volumes-from nginx-proxy \ + -v $HOME/certs:/etc/nginx/certs:rw \ + -v /var/run/docker.sock:/var/run/docker.sock:ro \ + jrcs/letsencrypt-nginx-proxy-companion + +docker run -d \ + --name blini \ + -e 'LETSENCRYPT_EMAIL=ajanco@haverford.edu' \ + -e 'LETSENCRYPT_HOST=blini.apjan.co' \ + -e 'VIRTUAL_HOST=blini.apjan.co' blini + +echo "🐳 Successfully started docker 🐳" + diff --git a/stop_docker b/stop_docker new file mode 100755 index 0000000..41918dd --- /dev/null +++ b/stop_docker @@ -0,0 +1,8 @@ +docker stop blini +docker stop nginx-letsencrypt +docker stop nginx-proxy +docker rm blini +docker rm nginx-letsencrypt +docker rm nginx-proxy +echo "🐳 Successfully stopped docker 🐳" +