From 0ff04818ae57e444cdb9e1a90e30ddb38a311856 Mon Sep 17 00:00:00 2001 From: viveksantayana Date: Thu, 1 Sep 2022 20:35:05 +0100 Subject: [PATCH] Containerise for deployment --- docker-compose.yml | 30 ++++++++++ nginx/conf.d/proxy_headers.conf | 6 ++ nginx/conf.d/wanderhome.conf | 17 ++++++ nginx/fastcgi.conf | 25 +++++++++ nginx/fastcgi_params | 24 ++++++++ nginx/mime.types | 98 +++++++++++++++++++++++++++++++++ nginx/nginx.conf | 30 ++++++++++ nginx/scgi_params | 17 ++++++ nginx/uwsgi_params | 16 ++++++ server/.dockerignore | 4 +- server/Dockerfile | 4 +- server/requirements.txt | 18 ++++++ 12 files changed, 286 insertions(+), 3 deletions(-) create mode 100644 nginx/conf.d/proxy_headers.conf create mode 100644 nginx/conf.d/wanderhome.conf create mode 100644 nginx/fastcgi.conf create mode 100644 nginx/fastcgi_params create mode 100644 nginx/mime.types create mode 100644 nginx/nginx.conf create mode 100644 nginx/scgi_params create mode 100644 nginx/uwsgi_params create mode 100644 server/requirements.txt diff --git a/docker-compose.yml b/docker-compose.yml index e69de29..f65ecca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -0,0 +1,30 @@ +version: '3.9' + +volumes: + app: + +services: + nginx: + container_name: wanderhome_nginx + image: nginx:alpine + volumes: + - ./src:/usr/share/nginx/html:ro + - ./nginx:/etc/nginx:ro + ports: + - 80:80 + - 443:443 + restart: unless-stopped + depends_on: + - wanderhome + + wanderhome: + container_name: wanderhome_server + image: wanderhome + build: ./server + env_file: + - ./.env + ports: + - 5000:5000 + volumes: + - app:/app/data + restart: unless-stopped \ No newline at end of file diff --git a/nginx/conf.d/proxy_headers.conf b/nginx/conf.d/proxy_headers.conf new file mode 100644 index 0000000..a2f48d3 --- /dev/null +++ b/nginx/conf.d/proxy_headers.conf @@ -0,0 +1,6 @@ +proxy_set_header X-Real-IP $remote_addr; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header Host $host; +proxy_set_header X-Forwarded-Host $host; +proxy_set_header X-Forwarded-Port $server_port; \ No newline at end of file diff --git a/nginx/conf.d/wanderhome.conf b/nginx/conf.d/wanderhome.conf new file mode 100644 index 0000000..6cd2987 --- /dev/null +++ b/nginx/conf.d/wanderhome.conf @@ -0,0 +1,17 @@ +server { + server_name _; + listen 80 default_server; + listen [::]:80 default_server; + + # Proxy API requests to the server + location ^~ /api/ { + include /etc/nginx/conf.d/proxy_headers.conf; + proxy_pass http://wanderhome:5000; + } + + # Proxy to the main app for all other requests + location / { + include /etc/nginx/mime.types; + alias /usr/share/nginx/html/; + } +} \ No newline at end of file diff --git a/nginx/fastcgi.conf b/nginx/fastcgi.conf new file mode 100644 index 0000000..238f786 --- /dev/null +++ b/nginx/fastcgi.conf @@ -0,0 +1,25 @@ +fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; \ No newline at end of file diff --git a/nginx/fastcgi_params b/nginx/fastcgi_params new file mode 100644 index 0000000..e5c2f5a --- /dev/null +++ b/nginx/fastcgi_params @@ -0,0 +1,24 @@ +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; \ No newline at end of file diff --git a/nginx/mime.types b/nginx/mime.types new file mode 100644 index 0000000..f806948 --- /dev/null +++ b/nginx/mime.types @@ -0,0 +1,98 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/wasm wasm; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 0000000..8447ca0 --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,30 @@ +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + keepalive_timeout 65; + server_tokens off; + #gzip on; + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/conf.d/sites-enabled/*.conf; +} diff --git a/nginx/scgi_params b/nginx/scgi_params new file mode 100644 index 0000000..1d56c8b --- /dev/null +++ b/nginx/scgi_params @@ -0,0 +1,17 @@ + +scgi_param REQUEST_METHOD $request_method; +scgi_param REQUEST_URI $request_uri; +scgi_param QUERY_STRING $query_string; +scgi_param CONTENT_TYPE $content_type; + +scgi_param DOCUMENT_URI $document_uri; +scgi_param DOCUMENT_ROOT $document_root; +scgi_param SCGI 1; +scgi_param SERVER_PROTOCOL $server_protocol; +scgi_param REQUEST_SCHEME $scheme; +scgi_param HTTPS $https if_not_empty; + +scgi_param REMOTE_ADDR $remote_addr; +scgi_param REMOTE_PORT $remote_port; +scgi_param SERVER_PORT $server_port; +scgi_param SERVER_NAME $server_name; \ No newline at end of file diff --git a/nginx/uwsgi_params b/nginx/uwsgi_params new file mode 100644 index 0000000..d26f2ff --- /dev/null +++ b/nginx/uwsgi_params @@ -0,0 +1,16 @@ +uwsgi_param QUERY_STRING $query_string; +uwsgi_param REQUEST_METHOD $request_method; +uwsgi_param CONTENT_TYPE $content_type; +uwsgi_param CONTENT_LENGTH $content_length; + +uwsgi_param REQUEST_URI $request_uri; +uwsgi_param PATH_INFO $document_uri; +uwsgi_param DOCUMENT_ROOT $document_root; +uwsgi_param SERVER_PROTOCOL $server_protocol; +uwsgi_param REQUEST_SCHEME $scheme; +uwsgi_param HTTPS $https if_not_empty; + +uwsgi_param REMOTE_ADDR $remote_addr; +uwsgi_param REMOTE_PORT $remote_port; +uwsgi_param SERVER_PORT $server_port; +uwsgi_param SERVER_NAME $server_name; \ No newline at end of file diff --git a/server/.dockerignore b/server/.dockerignore index 757ecb3..1fa7f5f 100644 --- a/server/.dockerignore +++ b/server/.dockerignore @@ -1,2 +1,4 @@ env/ -__pycache__/ \ No newline at end of file +venv/ +__pycache__/ +data/database.db \ No newline at end of file diff --git a/server/Dockerfile b/server/Dockerfile index c07088c..48c3bd9 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,8 +1,8 @@ -FROM python:3-10:alpine +FROM python:3.10-slim ARG DATA=./data/ ENV DATA=$DATA WORKDIR /app COPY . . RUN pip install --upgrade pip && pip install -r requirements.txt -RUN chmod +x install.py reset.py && ./install.py +RUN chmod +x install.py && ./install.py CMD [ "gunicorn", "-b", "0.0.0.0:5000", "-w", "5", "wsgi:app" ] \ No newline at end of file diff --git a/server/requirements.txt b/server/requirements.txt new file mode 100644 index 0000000..14a995f --- /dev/null +++ b/server/requirements.txt @@ -0,0 +1,18 @@ +click==8.1.3 +Flask==2.2.2 +Flask-Cors==3.0.10 +Flask-SQLAlchemy==2.5.1 +greenlet==1.1.3 +gunicorn==20.1.0 +itsdangerous==2.1.2 +Jinja2==3.1.2 +MarkupSafe==2.1.1 +numpy==1.23.2 +pip==22.2.2 +python-dotenv==0.20.0 +setuptools==65.3.0 +six==1.16.0 +SQLAlchemy==1.4.40 +sqlalchemy-json==0.5.0 +Werkzeug==2.2.2 +wheel==0.37.1