Remove duplicate depends_on keys
Some checks failed
/ terraform (push) Successful in 48s
/ ansible (push) Failing after 2m13s

This commit is contained in:
Jake Howard 2023-06-15 14:20:52 +01:00
parent cdbdca1fb8
commit aa8ceec290
Signed by: jake
GPG key ID: 57AFB45680EDD477
2 changed files with 32 additions and 23 deletions

View file

@ -1,5 +1,26 @@
version: "2.3" version: "2.3"
x-app: &app
image: cthulhoo/ttrss-fpm-pgsql-static:latest
restart: unless-stopped
environment:
- TTRSS_DB_USER=tt-rss
- TTRSS_DB_NAME=tt-rss
- TTRSS_DB_PASS=tt-rss
- TTRSS_SELF_URL_PATH=https://tt-rss.jakehoward.tech/tt-rss/
- TTRSS_ENABLE_REGISTRATION=false
- TTRSS_CHECK_FOR_UPDATES=false
- TTRSS_ENABLE_GZIP_OUTPUT=true
- TTRSS_NO_STARTUP_PLUGIN_UPDATES=true
- OWNER_UID={{ docker_user.id }}
- OWNER_GID={{ docker_user.id }}
- PHP_WORKER_MAX_CHILDREN=50
- PHP_WORKER_MEMORY_LIMIT=512M
volumes:
- ./tt-rss:/var/www/html
- "{{ app_data_dir }}/tt-rss/feed-icons:/var/www/html/tt-rss/feed-icons"
- ./plugins:/var/www/html/tt-rss/plugins.local
services: services:
nginx: nginx:
image: cthulhoo/ttrss-web-nginx:latest image: cthulhoo/ttrss-web-nginx:latest
@ -19,26 +40,8 @@ services:
- default - default
- traefik - traefik
app: &app app:
image: cthulhoo/ttrss-fpm-pgsql-static:latest <<: *app
restart: unless-stopped
environment:
- TTRSS_DB_USER=tt-rss
- TTRSS_DB_NAME=tt-rss
- TTRSS_DB_PASS=tt-rss
- TTRSS_SELF_URL_PATH=https://tt-rss.jakehoward.tech/tt-rss/
- TTRSS_ENABLE_REGISTRATION=false
- TTRSS_CHECK_FOR_UPDATES=false
- TTRSS_ENABLE_GZIP_OUTPUT=true
- TTRSS_NO_STARTUP_PLUGIN_UPDATES=true
- OWNER_UID={{ docker_user.id }}
- OWNER_GID={{ docker_user.id }}
- PHP_WORKER_MAX_CHILDREN=50
- PHP_WORKER_MEMORY_LIMIT=512M
volumes:
- ./tt-rss:/var/www/html
- "{{ app_data_dir }}/tt-rss/feed-icons:/var/www/html/tt-rss/feed-icons"
- ./plugins:/var/www/html/tt-rss/plugins.local
depends_on: depends_on:
- db - db

View file

@ -24,9 +24,6 @@ x-website: &website
- ./media:/app/media - ./media:/app/media
tmpfs: tmpfs:
- /tmp - /tmp
depends_on:
- db
- redis
services: services:
nginx: nginx:
@ -45,14 +42,23 @@ services:
worker: worker:
<<: *website <<: *website
command: /app/etc/entrypoints/worker command: /app/etc/entrypoints/worker
depends_on:
- db
- redis
cron: cron:
<<: *website <<: *website
command: /app/etc/entrypoints/cron command: /app/etc/entrypoints/cron
depends_on:
- db
- redis
django: django:
<<: *website <<: *website
command: /app/etc/entrypoints/web command: /app/etc/entrypoints/web
depends_on:
- db
- redis
db: db:
image: postgres:14-alpine image: postgres:14-alpine