diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b48b04..5424765 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ workflow: - when: never stages: - - test +# - test - build - pre_push - push @@ -18,6 +18,7 @@ test: image: python:3.11-alpine script: - pip install -q -r requirements.txt + - pip install -q pytest~=8.3.5 - python -m unittest discover tests build: diff --git a/docker-compose.yml b/docker-compose.yml index ed70b08..6c17ae9 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,13 @@ +x-conf: &conf + environment: + - TZ=Europe/Moscow + dns: + - 9.9.9.9 + networks: + rss-proxy_net: + services: + <<: *conf proxy: image: registry.beaconborn.ru/bacon/rss-proxy:latest container_name: proxy @@ -7,8 +16,8 @@ services: environment: - REDIS_URL=redis://redis:6379/0 - CACHE_TTL=3600 - depends_on: - - redis + restart: unless-stopped + depends_on: redis healthcheck: test: [ "CMD", "python3", "/proxy/test.py" ] interval: 30s @@ -24,8 +33,6 @@ services: - "6379:6379" volumes: - redis_data:/data - environment: - - TZ=Europe/Moscow healthcheck: test: [ "CMD", "redis-cli", "ping" ] interval: 10s @@ -33,4 +40,7 @@ services: retries: 3 volumes: - redis_data: \ No newline at end of file + redis_data: + +networks: + rss-proxy_net: \ No newline at end of file