move docker logs to syslog (7e7e40a6) · Commits · e / infra / spot

.env.prod

+0 −1

Original line number	Diff line number	Diff line
		@@ -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/

+8 −10

Original line number	Diff line number	Diff line
		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
		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}-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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;