From aa8ceec2907d69761ef84747c2ecf0d6cb8a155f Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Thu, 15 Jun 2023 14:20:52 +0100
Subject: [PATCH] Remove duplicate `depends_on` keys

---
 .../files/tt-rss/docker-compose.yml           | 43 ++++++++++---------
 .../roles/website/files/docker-compose.yml    | 12 ++++--
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml b/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml
index 70093f8..9647c82 100644
--- a/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml
+++ b/ansible/roles/pve_docker/files/tt-rss/docker-compose.yml
@@ -1,5 +1,26 @@
 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:
   nginx:
     image: cthulhoo/ttrss-web-nginx:latest
@@ -19,26 +40,8 @@ services:
       - default
       - traefik
 
-  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
+  app:
+    <<: *app
     depends_on:
       - db
 
diff --git a/ansible/roles/website/files/docker-compose.yml b/ansible/roles/website/files/docker-compose.yml
index 3f3b03a..b3e94a1 100644
--- a/ansible/roles/website/files/docker-compose.yml
+++ b/ansible/roles/website/files/docker-compose.yml
@@ -24,9 +24,6 @@ x-website: &website
     - ./media:/app/media
   tmpfs:
     - /tmp
-  depends_on:
-    - db
-    - redis
 
 services:
   nginx:
@@ -45,14 +42,23 @@ services:
   worker:
     <<: *website
     command: /app/etc/entrypoints/worker
+    depends_on:
+      - db
+      - redis
 
   cron:
     <<: *website
     command: /app/etc/entrypoints/cron
+    depends_on:
+      - db
+      - redis
 
   django:
     <<: *website
     command: /app/etc/entrypoints/web
+    depends_on:
+      - db
+      - redis
 
   db:
     image: postgres:14-alpine