From 54eaf55ee8816dce38ba5034196043e7624b6a57 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Tue, 4 Jul 2023 10:24:11 +0200 Subject: [PATCH] refactored docker-compose.yml so very simple example, and moved proxy to "examples" directory --- README.md | 4 +- docker-compose.yml | 110 ++----------------- examples/docker-compose-http-and-https.yml | 120 +++++++++++++++++++++ 3 files changed, 131 insertions(+), 103 deletions(-) create mode 100644 examples/docker-compose-http-and-https.yml diff --git a/README.md b/README.md index f6768b4..698dae2 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ docker run -e DLS_URL=`hostname -i` -e DLS_PORT=443 -p 443:443 -v $WORKING_DIR:/ **Docker-Compose / Deploy stack** -Goto [`docker-compose.yml`](docker-compose.yml) for more advanced example (with reverse proxy usage). +See [`examples`](examples) directory for more advanced examples (with reverse proxy usage). ```yaml version: '3.9' @@ -682,7 +682,7 @@ The error message can safely be ignored (since we have no license limitation :P) <0>:End Logging ``` -#### log with nginx as reverse proxy (see [docker-compose.yml](docker-compose.yml)) +#### log with nginx as reverse proxy (see [docker-compose-http-and-https.yml](examples/docker-compose-http-and-https.yml)) ``` <1>:NLS initialized diff --git a/docker-compose.yml b/docker-compose.yml index f561a3d..506a1a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,108 +14,16 @@ services: restart: always environment: <<: *dls-variables - volumes: - - /etc/timezone:/etc/timezone:ro - - /opt/docker/fastapi-dls/cert:/app/cert # instance.private.pem, instance.public.pem - - db:/app/database - entrypoint: ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--app-dir", "/app", "--proxy-headers"] - healthcheck: - test: ["CMD", "curl", "--fail", "http://localhost:8000/-/health"] - interval: 10s - timeout: 5s - retries: 3 - start_period: 30s - proxy: - image: nginx ports: - # thees are ports where nginx (!) is listen to - - "80:80" # for "/leasing/v1/lessor/shutdown" used by windows guests, can't be changed! - - "443:443" # first part must match "DLS_PORT" + - "443:443" volumes: - - /etc/timezone:/etc/timezone:ro - - /opt/docker/fastapi-dls/cert:/opt/cert - healthcheck: - test: ["CMD", "curl", "--insecure", "--fail", "https://localhost/-/health"] - interval: 10s - timeout: 5s - retries: 3 - start_period: 30s - command: | - bash -c "bash -s <<\"EOF\" - cat > /etc/nginx/nginx.conf <<\"EON\" - daemon off; - user root; - worker_processes auto; - - events { - worker_connections 1024; - } - - http { - gzip on; - gzip_disable "msie6"; - include /etc/nginx/mime.types; - - upstream dls-backend { - server dls:8000; # must match dls listen port - } - - server { - listen 443 ssl http2 default_server; - listen [::]:443 ssl http2 default_server; - - root /var/www/html; - index index.html; - server_name _; - - ssl_certificate "/opt/cert/webserver.crt"; - ssl_certificate_key "/opt/cert/webserver.key"; - ssl_session_cache shared:SSL:1m; - ssl_session_timeout 10m; - ssl_protocols TLSv1.3 TLSv1.2; - # ssl_ciphers "ECDHE-ECDSA-CHACHA20-POLY1305"; - # ssl_ciphers PROFILE=SYSTEM; - ssl_prefer_server_ciphers on; - - location / { - proxy_set_header Host $$http_host; - 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_pass http://dls-backend$$request_uri; - } - - location = /-/health { - access_log off; - add_header 'Content-Type' 'application/json'; - return 200 '{\"status\":\"up\",\"service\":\"nginx\"}'; - } - } - - server { - listen 80; - listen [::]:80; - - root /var/www/html; - index index.html; - server_name _; - - location /leasing/v1/lessor/shutdown { - proxy_set_header Host $$http_host; - 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_pass http://dls-backend/leasing/v1/lessor/shutdown; - } - - location / { - return 301 https://$$host$$request_uri; - } - } - } - EON - nginx - EOF" + - /opt/docker/fastapi-dls/cert:/app/cert + - dls-db:/app/database + logging: # optional, for those who do not need logs + driver: "json-file" + options: + max-file: 5 + max-size: 10m volumes: - db: + dls-db: diff --git a/examples/docker-compose-http-and-https.yml b/examples/docker-compose-http-and-https.yml new file mode 100644 index 0000000..3f02cdc --- /dev/null +++ b/examples/docker-compose-http-and-https.yml @@ -0,0 +1,120 @@ +version: '3.9' + +x-dls-variables: &dls-variables + DLS_URL: localhost # REQUIRED, change to your ip or hostname + DLS_PORT: 443 # must match nginx listen & exposed port + LEASE_EXPIRE_DAYS: 90 + DATABASE: sqlite:////app/database/db.sqlite + DEBUG: false + +services: + dls: + image: collinwebdesigns/fastapi-dls:latest + restart: always + environment: + <<: *dls-variables + volumes: + - /etc/timezone:/etc/timezone:ro + - /opt/docker/fastapi-dls/cert:/app/cert # instance.private.pem, instance.public.pem + - db:/app/database + entrypoint: ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--app-dir", "/app", "--proxy-headers"] + healthcheck: + test: ["CMD", "curl", "--fail", "http://localhost:8000/-/health"] + interval: 10s + timeout: 5s + retries: 3 + start_period: 30s + proxy: + image: nginx + ports: + # thees are ports where nginx (!) is listen to + - "80:80" # for "/leasing/v1/lessor/shutdown" used by windows guests, can't be changed! + - "443:443" # first part must match "DLS_PORT" + volumes: + - /etc/timezone:/etc/timezone:ro + - /opt/docker/fastapi-dls/cert:/opt/cert + healthcheck: + test: ["CMD", "curl", "--insecure", "--fail", "https://localhost/-/health"] + interval: 10s + timeout: 5s + retries: 3 + start_period: 30s + command: | + bash -c "bash -s <<\"EOF\" + cat > /etc/nginx/nginx.conf <<\"EON\" + daemon off; + user root; + worker_processes auto; + + events { + worker_connections 1024; + } + + http { + gzip on; + gzip_disable "msie6"; + include /etc/nginx/mime.types; + + upstream dls-backend { + server dls:8000; # must match dls listen port + } + + server { + listen 443 ssl http2 default_server; + listen [::]:443 ssl http2 default_server; + + root /var/www/html; + index index.html; + server_name _; + + ssl_certificate "/opt/cert/webserver.crt"; + ssl_certificate_key "/opt/cert/webserver.key"; + ssl_session_cache shared:SSL:1m; + ssl_session_timeout 10m; + ssl_protocols TLSv1.3 TLSv1.2; + # ssl_ciphers "ECDHE-ECDSA-CHACHA20-POLY1305"; + # ssl_ciphers PROFILE=SYSTEM; + ssl_prefer_server_ciphers on; + + location / { + proxy_set_header Host $$http_host; + 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_pass http://dls-backend$$request_uri; + } + + location = /-/health { + access_log off; + add_header 'Content-Type' 'application/json'; + return 200 '{\"status\":\"up\",\"service\":\"nginx\"}'; + } + } + + server { + listen 80; + listen [::]:80; + + root /var/www/html; + index index.html; + server_name _; + + location /leasing/v1/lessor/shutdown { + proxy_set_header Host $$http_host; + 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_pass http://dls-backend/leasing/v1/lessor/shutdown; + } + + location / { + return 301 https://$$host$$request_uri; + } + } + } + EON + nginx + EOF" + +volumes: + db: