diff --git a/docker-compose.yml b/docker-compose.yml index ace9c07..aa3037d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,10 @@ services: nginx: image: nginx ports: - - "8004:80" + - "80:80" volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro + - /home/meiri/alkator/nginx.conf:/etc/nginx/nginx.conf:ro + - /home/meiri/alkator/:/alkator labels: - "traefik.enable=true" - "traefik.http.routers.alkatorweb.rule=Host(`zaloha.alkator.cz`)" diff --git a/nginx.conf b/nginx.conf index 67e1fa3..3f2bf72 100644 --- a/nginx.conf +++ b/nginx.conf @@ -31,14 +31,6 @@ http { '"request_time": "$request_time" ' '}'; - server { - listen 8080; - server_name localhost; - location = /stub_status{ - stub_status; - } - } - server { listen 80; @@ -50,14 +42,14 @@ http { location /api{ proxy_read_timeout 300; - proxy_pass http://localhost:8005; + proxy_pass http://api:8005; } location /api/upload_files{ client_max_body_size 100M; - proxy_pass http://localhost:8005; + proxy_pass http://api:8005; } location /admin { - proxy_pass http://localhost:8005; + proxy_pass http://api:8005; } location /static { root /alkator; @@ -74,6 +66,4 @@ http { } } - - include sites-enabled/*; } \ No newline at end of file