diff --git a/.env b/.env index 125455dd48ca589b2f11151f31fa2990ae20bf44..f7eba7e87e06772171c8353f887ea28172470399 100644 --- a/.env +++ b/.env @@ -8,4 +8,4 @@ SEARX_PROXY_HTTP=socks5h://tor-socks-proxy:9150 SEARX_PROXY_HTTPS=socks5h://tor-socks-proxy:9150 FILTRON_PORT=8088 NODE_NAME=local -CI_REGISTRY_IMAGE=registry.gitlab.e.foundation/e/infra/spot \ No newline at end of file +CI_REGISTRY_IMAGE=registry.gitlab.e.foundation/e/infra/spot diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 9730f5b2346f710b0233a9b206ff1d65b63bf43a..325f0229b0ed54e4108728833cf0012148ab5ab6 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -14,7 +14,7 @@ services: build: context: . dockerfile: Dockerfile - logging: + logging: driver: syslog options: tag: docker-${ENVIRONMENT_NAME}-spot-app @@ -37,7 +37,7 @@ services: spot-nginx: image: nginx:1.23 restart: always - logging: + logging: driver: syslog options: tag: docker-${ENVIRONMENT_NAME}-spot-nginx @@ -45,9 +45,11 @@ services: - ${INTERNAL_NETWORK_NAME} volumes: - ./etc/nginx/conf.d/spot.conf:/etc/nginx/conf.d/default.conf - - ./etc/nginx/nginx.conf:/etc/nginx/nginx.conf + - ./etc/nginx/nginx.conf:/etc/nginx/nginx.conf - ./etc/nginx/proxy_spot_params:/etc/nginx/proxy_spot_params - ./searx/static:/var/www/spot/static + labels: + - "com.centurylinklabs.watchtower.scope=staging-spot" filtron: image: dalf/filtron:latest @@ -61,6 +63,13 @@ services: volumes: - ./etc/filtron/rules.json:/etc/filtron/rules.json + watchtower: + image: containrrr/watchtower + volumes: + - /var/run/docker.sock:/var/run/docker.sock + command: --interval 86400 --scope staging-spot + labels: + - "com.centurylinklabs.watchtower.scope=staging-spot" networks: staging-spot-default: