diff --git a/docker-compose.yml b/docker-compose.yml index 6c17ae9..587b04a 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,23 +1,24 @@ x-conf: &conf - environment: - - TZ=Europe/Moscow - dns: - - 9.9.9.9 - networks: - rss-proxy_net: + environment: + TZ: Europe/Moscow + restart: unless-stopped + dns: + - 9.9.9.9 + networks: + - rss-proxy_net services: - <<: *conf proxy: + <<: *conf image: registry.beaconborn.ru/bacon/rss-proxy:latest container_name: proxy ports: - - "5050:5050" + - 5050:5050 environment: - - REDIS_URL=redis://redis:6379/0 - - CACHE_TTL=3600 - restart: unless-stopped - depends_on: redis + REDIS_URL: redis://redis:6379/0 + CACHE_TTL: 3600 + depends_on: + - redis healthcheck: test: [ "CMD", "python3", "/proxy/test.py" ] interval: 30s @@ -25,12 +26,12 @@ services: retries: 3 redis: + <<: *conf image: redis:latest container_name: redis - restart: unless-stopped command: [ "redis-server" ] ports: - - "6379:6379" + - 6379:6379 volumes: - redis_data:/data healthcheck: