diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index 4b50e4b..8fb35af 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -13,6 +13,8 @@ services: ports: - "8081:8081" - "8080:8080" + networks: + - app-network command: julia --project=. -e 'include("api.jl")' --color=yes --depwarn=no --project=@. --sysimage="pre-compilation/sysimage.so" -q -i -- $$(dirname $$0)/../bootstrap.jl -s=true "$$@" nginx: @@ -23,6 +25,8 @@ services: ports: - "80:80" - "443:443" + networks: + - app-network volumes: - /etc/letsencrypt:/etc/letsencrypt - /usr/share/nginx/html/.well-known:/usr/share/nginx/html/.well-known @@ -31,6 +35,8 @@ services: certbot: image: certbot/certbot container_name: certbot + networks: + - app-network volumes: - /etc/letsencrypt:/etc/letsencrypt - /usr/share/nginx/html/.well-known:/usr/share/nginx/html/.well-known @@ -43,6 +49,8 @@ services: restart: always ports: - "8501:8501" + networks: + - app-network command: streamlit run app.py --global.disableWidgetStateDuplicationWarning true --server.port=8501 umami: @@ -55,6 +63,8 @@ services: HASH_SALT: ${HASH_SALT} ports: - "3000:3000" + networks: + - app-network depends_on: - umami-db @@ -66,9 +76,15 @@ services: POSTGRES_USER: umami POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: umami + networks: + - app-network volumes: - umami_db_data:/var/lib/postgresql/data # Define volumes at the root level, outside of services volumes: umami_db_data: + +networks: + app-network: + driver: bridge \ No newline at end of file diff --git a/gui/app_pages/Home.py b/gui/app_pages/Home.py index bd41051..4011169 100644 --- a/gui/app_pages/Home.py +++ b/gui/app_pages/Home.py @@ -16,7 +16,7 @@ from app_scripts import app_view components.html( - '' + '' ) diff --git a/nginx/project.conf b/nginx/project.conf index e755895..04a4426 100644 --- a/nginx/project.conf +++ b/nginx/project.conf @@ -33,13 +33,13 @@ server { # Umami analytics application proxy location /umami/ { - rewrite /umami/(.*) /$1 break; proxy_pass http://umami:3000/; proxy_http_version 1.1; proxy_set_header Host $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; + rewrite /umami/(.*) /$1 break; } # SSL configuration