diff --git a/.env.prod b/.env.prod index 024b6f172596dcd93b8de999b86c9651ba9de0b4..9ed4a2762759d7736e1ce0de6bc4a418cc50a5a7 100644 --- a/.env.prod +++ b/.env.prod @@ -13,4 +13,3 @@ CI_REGISTRY_IMAGE=image SENTRY_DSN=public_key:gitlab.com SENTRY_TRACES_SAMPLE_RATE=1.0 ENVIRONMENT_NAME=prod -LOG_DIRECTORY=/volumes/spot-nginx-log/ diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e2f9f614a011fea000d3c5e5d1d93f66b37df0be..0323f62e1ec726aed86de9aa2c6320cdd0a11833 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,17 +1,9 @@ version: '3.6' -x-logging: - &default-logging - options: - max-size: '100m' - max-file: '3' - driver: json-file - services: redis: image: redis:5.0.7-alpine # container_name: spot-redis - logging: *default-logging restart: always networks: - ${INTERNAL_NETWORK_NAME} @@ -22,7 +14,10 @@ services: build: context: . dockerfile: Dockerfile - logging: *default-logging + logging: + driver: syslog + options: + tag: docker-${ENVIRONMENT_NAME}-spot-app restart: always networks: - ${INTERNAL_NETWORK_NAME} @@ -42,6 +37,10 @@ services: spot-nginx: image: nginx:1.23 restart: always + logging: + driver: syslog + options: + tag: docker-${ENVIRONMENT_NAME}-spot-nginx networks: - ${INTERNAL_NETWORK_NAME} volumes: @@ -49,7 +48,6 @@ services: - ./etc/nginx/nginx.conf:/etc/nginx/nginx.conf - ./etc/nginx/proxy_spot_params:/etc/nginx/proxy_spot_params - ./searx/static:/var/www/spot/static - - ${LOG_DIRECTORY}:/var/log/nginx filtron: image: dalf/filtron:latest diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf index d0e73015aef1b9dd1656c382d43c878b56d35f3f..9621f159f9f41818672018fc4c4d2f4b413eb118 100644 --- a/etc/nginx/nginx.conf +++ b/etc/nginx/nginx.conf @@ -18,8 +18,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$remote_addr"'; - access_log /var/log/nginx/access.log main; - error_log /var/log/nginx/error.log warn; + error_log stderr warn; + access_log /dev/stdout main; sendfile on; #tcp_nopush on;