Implemented repository wide restart policy

2025-10-31 02:10:05 +00:00 · 2024-01-12 20:57:58 +01:00
parent 695618a170
commit 2f3d90cd07
26 changed files with 53 additions and 53 deletions
--- a/group_vars/all
+++ b/group_vars/all
@@ -146,6 +146,7 @@ domains_wordpress:              ["wordpress.{{top_domain}}","blog.{{top_domain}}
 postgres_default_version:       "16"

 ### Docker Role Specific Parameters
+docker_restart_policy:        "unless-stopped"

 #### Akaunting
 version_akaunting:            "latest"
--- a/roles/docker-akaunting/templates/docker-compose.yml.j2
+++ b/roles/docker-akaunting/templates/docker-compose.yml.j2
@@ -12,7 +12,7 @@ services:
      - 127.0.0.1:{{http_port}}:80
    volumes:
      - data:/var/www/html
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
    env_file:
      - env/run.env
    environment:
--- a/roles/docker-baserow/templates/docker-compose.yml.j2
+++ b/roles/docker-baserow/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@ services:
  application:
    image: baserow/baserow:1.19.1
    container_name: baserow-application
-    restart: always
+    restart: {{docker_restart_policy}}
    logging:
      driver: journald
    env_file:
--- a/roles/docker-funkwhale/templates/docker-compose.yml.j2
+++ b/roles/docker-funkwhale/templates/docker-compose.yml.j2
@@ -5,7 +5,7 @@ services:
 {% include 'templates/docker-service-redis.yml.j2' %}

  celeryworker:
-    restart: always
+    restart: {{docker_restart_policy}}
    image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
    env_file: .env
    command: celery -A funkwhale_api.taskapp worker -l INFO --concurrency=${CELERYD_CONCURRENCY-0}
@@ -18,7 +18,7 @@ services:


  celerybeat:
-    restart: always
+    restart: {{docker_restart_policy}}
    image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
    env_file: .env
    command: celery -A funkwhale_api.taskapp beat --pidfile= -l INFO
@@ -26,7 +26,7 @@ services:
 {% include 'templates/docker-container-networks.yml.j2' %}

  api:
-    restart: always
+    restart: {{docker_restart_policy}}
    image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
    depends_on:
    env_file: .env
@@ -39,7 +39,7 @@ services:
 {% include 'templates/docker-container-networks.yml.j2' %}

  front:
-    restart: always
+    restart: {{docker_restart_policy}}
    image: funkwhale/front:${FUNKWHALE_VERSION:-latest}
    depends_on:
      - api
--- a/roles/docker-gitea/templates/docker-compose.yml.j2
+++ b/roles/docker-gitea/templates/docker-compose.yml.j2
@@ -7,7 +7,7 @@ services:
  application:
    logging:
      driver: journald
-    restart: always
+    restart: {{docker_restart_policy}}
    image: gitea/gitea:latest
    environment:
      - USER_UID=1000
--- a/roles/docker-gitlab/templates/docker-compose.yml.j2
+++ b/roles/docker-gitlab/templates/docker-compose.yml.j2
@@ -7,7 +7,7 @@ services:

  web:
    image: 'gitlab/gitlab-ee:latest'
-    restart: always
+    restart: {{docker_restart_policy}}
    hostname: '{{domain}}'
    environment:
      GITLAB_OMNIBUS_CONFIG: |
--- a/roles/docker-jenkins/tasks/main.yml
+++ b/roles/docker-jenkins/tasks/main.yml
@@ -7,10 +7,9 @@
    definition:
      application:
        image: jenkins/jenkins:lts
-        restart: always
+        restart: "{{docker_restart_policy}}"
        ports:
          - "127.0.0.1:{{http_port}}:8080"
-        restart: always
        volumes:
          - jenkins_data:/var/jenkins_home
        log_driver: journald
--- a/roles/docker-joomla/templates/docker-compose.yml.j2
+++ b/roles/docker-joomla/templates/docker-compose.yml.j2
@@ -13,7 +13,7 @@ services:
      JOOMLA_DB_USER: "{{database_username}}"
      JOOMLA_DB_PASSWORD: "{{database_password}}"
      JOOMLA_DB_NAME: "{{database_name}}"
-    restart: always
+    restart: {{docker_restart_policy}}
    volumes:
      - data:/var/www/html
    ports:
--- a/roles/docker-listmonk/templates/docker-compose.yml.j2
+++ b/roles/docker-listmonk/templates/docker-compose.yml.j2
@@ -5,7 +5,7 @@ services:
 {% include 'templates/docker-service-' + database_type + '.yml.j2' %}

  application:
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
    image: listmonk/listmonk:latest
    ports:
      - "127.0.0.1:{{http_port}}:9000"
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -10,7 +10,7 @@ services:
  resolver:
    image: ghcr.io/mailu/unbound:{{version_mailu}}
    env_file: mailu.env
-    restart: always
+    restart: {{docker_restart_policy}}
 {% include 'templates/docker-container-networks.yml.j2' %}
        ipv4_address: 192.168.203.254
    logging:
@@ -18,7 +18,7 @@ services:

  front:
    image: ghcr.io/mailu/nginx:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: mailu.env
    logging:
      driver: journald
@@ -45,7 +45,7 @@ services:
      
  admin:
    image: ghcr.io/mailu/admin:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: mailu.env
    volumes:
      - "admin_data:/data"
@@ -63,7 +63,7 @@ services:

  imap:
    image: ghcr.io/mailu/dovecot:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: mailu.env
    volumes:
      - "dovecot_mail:/mail"
@@ -79,7 +79,7 @@ services:

  smtp:
    image: ghcr.io/mailu/postfix:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: mailu.env
    volumes:
      - "/etc/mailu/overrides:/overrides:ro"
@@ -96,7 +96,7 @@ services:
  oletools:
    image: ghcr.io/mailu/oletools:{{version_mailu}}
    hostname: oletools
-    restart: always
+    restart: {{docker_restart_policy}}
    depends_on:
      - resolver
    dns:
@@ -106,7 +106,7 @@ services:

  antispam:
    image: ghcr.io/mailu/rspamd:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: mailu.env
    volumes:
      - "filter:/var/lib/rspamd"
@@ -128,7 +128,7 @@ services:
  # Optional services
  antivirus:
    image: ghcr.io/mailu/clamav:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: mailu.env
    volumes:
      - "filter:/data"
@@ -142,7 +142,7 @@ services:

  webdav:
    image: ghcr.io/mailu/radicale:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: mailu.env
    volumes:
      - "webdav_data:/data"
@@ -159,7 +159,7 @@ services:
    image: ghcr.io/mailu/fetchmail:{{version_mailu}}
    volumes:
      - "admin_data:/data"
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: mailu.env
    logging:
      driver: journald
@@ -174,7 +174,7 @@ services:

  webmail:
    image: ghcr.io/mailu/webmail:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: mailu.env
    volumes:
      - "webmail_data:/data"
--- a/roles/docker-mariadb/tasks/main.yml
+++ b/roles/docker-mariadb/tasks/main.yml
@@ -24,7 +24,7 @@
    published_ports:
      - "127.0.0.1:3306:3306" # can be that this will be removed if all applications use sockets
    command: "--transaction-isolation=READ-COMMITTED --binlog-format=ROW" #for nextcloud
-    restart_policy: unless-stopped
+    restart_policy: "{{docker_restart_policy}}"
    healthcheck:
      test: "/usr/bin/mariadb --user=root --password={{central_mariadb_root_password}} --execute \"SHOW DATABASES;\""
      interval: 3s
--- a/roles/docker-mastodon/templates/docker-compose.yml.j2
+++ b/roles/docker-mastodon/templates/docker-compose.yml.j2
@@ -7,7 +7,7 @@ services:

  web:
    image: ghcr.io/mastodon/mastodon:{{version_mastodon}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: .env.production
    command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
    healthcheck:
@@ -23,7 +23,7 @@ services:

  streaming:
    image: ghcr.io/mastodon/mastodon:{{version_mastodon}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: .env.production
    command: node ./streaming
    healthcheck:
@@ -37,7 +37,7 @@ services:

  sidekiq:
    image: ghcr.io/mastodon/mastodon:{{version_mastodon}}
-    restart: always
+    restart: {{docker_restart_policy}}
    env_file: .env.production
    command: bundle exec sidekiq
 {% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
--- a/roles/docker-matomo/templates/docker-compose.yml.j2
+++ b/roles/docker-matomo/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@ services:
    logging:
      driver: journald
    image: matomo
-    restart: always
+    restart: {{docker_restart_policy}}
    ports:
      - "127.0.0.1:{{http_port}}:80"
    environment:
--- a/roles/docker-matrix-compose/templates/docker-compose.yml.j2
+++ b/roles/docker-matrix-compose/templates/docker-compose.yml.j2
@@ -6,7 +6,7 @@ services:

  synapse:
    image: matrixdotorg/synapse:latest
-    restart: always
+    restart: {{docker_restart_policy}}
    logging:
      driver: journald
    volumes:
@@ -23,7 +23,7 @@ services:
  
  element:
    image: vectorim/element-web:latest
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
    volumes:
      - ./element-config.json:/app/config.json
    ports:
@@ -34,28 +34,28 @@ services:
  #mautrix-telegram:
  #  container_name: mautrix-telegram
  #  image: dock.mau.dev/mautrix/telegram:<version>
-  #  restart: unless-stopped
+  #  restart: {{docker_restart_policy}}
  #  volumes:
  #  - telegram_bridge_data:/data

  #mautrix-whatsapp:
  #  container_name: mautrix-whatsapp
  #  image: dock.mau.dev/mautrix/whatsapp:latest
-  #  restart: unless-stopped
+  #  restart: {{docker_restart_policy}}
  #  volumes:
  #  - ./mautrix_whatsapp:/data

  #mautrix-facebook:
  #  container_name: mautrix-facebook
  #  image: dock.mau.dev/mautrix/facebook:<version>
-  #  restart: unless-stopped
+  #  restart: {{docker_restart_policy}}
  #  volumes:
  #  - facebook_bridge_data:/data

  #mautrix-instagram:
  #  container_name: mautrix-instagram
  #  image: dock.mau.dev/mautrix/instagram:<version>
-  #  restart: unless-stopped
+  #  restart: {{docker_restart_policy}}
  #  volumes:
  #  - instagram_bridge_data:/data  

--- a/roles/docker-mediawiki/tasks/main.yml
+++ b/roles/docker-mediawiki/tasks/main.yml
@@ -8,7 +8,7 @@
      application:
        log_driver: journald
        image: mediawiki
-        restart: always
+        restart: "{{docker_restart_policy}}"
        depends_on:
          - database
        volumes:
@@ -26,4 +26,4 @@
          MARIADB_AUTO_UPGRADE: "1"
        volumes:
          - database:/var/lib/mysql
-        restart: always
+        restart: "{{docker_restart_policy}}"
--- a/roles/docker-mybb/templates/docker-compose.yml.j2
+++ b/roles/docker-mybb/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@ services:
      options:
        tag: "mybb_application"
    image: mybb/mybb:latest
-    restart: always
+    restart: {{docker_restart_policy}}
    volumes:
      - data:/var/www/html
 {% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
@@ -21,7 +21,7 @@ services:
      options:
        tag: "mybb_server"
    image: nginx:mainline
-    restart: always
+    restart: {{docker_restart_policy}}
    ports:
      - "127.0.0.1:{{http_port}}:80"
    volumes:
--- a/roles/docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@ services:

  application:
    image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
-    restart: always
+    restart: {{docker_restart_policy}}
    logging:
      driver: journald
    volumes:
@@ -25,7 +25,7 @@ services:
    image: nginx:alpine
    logging:
      driver: journald
-    restart: always
+    restart: {{docker_restart_policy}}
    ports:
      - "127.0.0.1:{{http_port}}:80"
    volumes:
@@ -41,7 +41,7 @@ services:

  cron:
    image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
-    restart: always
+    restart: {{docker_restart_policy}}
    logging:
      driver: journald
    volumes:
--- a/roles/docker-openproject/templates/docker-compose.yml.j2
+++ b/roles/docker-openproject/templates/docker-compose.yml.j2
@@ -1,7 +1,7 @@
 version: "3.7"
  
 x-op-app: &app
-  restart: unless-stopped
+  restart: {{docker_restart_policy}}
  image: openproject/community:${TAG:-13}
  environment:
    OPENPROJECT_HTTPS: "${OPENPROJECT_HTTPS}"
@@ -25,11 +25,11 @@ services:

  cache:
    image: memcached
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
 {% include 'templates/docker-container-networks.yml.j2' %}

  proxy:
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
    image: openproject/community:${TAG:-13}
    command: "./docker/prod/proxy"
    ports:
--- a/roles/docker-pixelfed/templates/docker-compose.yml.j2
+++ b/roles/docker-pixelfed/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@ services:

  application:
    image: zknt/pixelfed
-    restart: always
+    restart: {{docker_restart_policy}}
    logging:
      driver: journald
    env_file:
@@ -23,7 +23,7 @@ services:
 {% include 'templates/docker-container-networks.yml.j2' %}
  worker:
    image: zknt/pixelfed
-    restart: always
+    restart: {{docker_restart_policy}}
    logging:
      driver: journald
    env_file:
--- a/roles/docker-postgres/tasks/main.yml
+++ b/roles/docker-postgres/tasks/main.yml
@@ -18,7 +18,7 @@
      - "127.0.0.1:5432:5432"
    volumes:
      - central_postgres_database:/var/lib/postgresql/data
-    restart_policy: unless-stopped
+    restart_policy: "{{docker_restart_policy}}"
    healthcheck:
      test: ["CMD-SHELL", "pg_isready -U postgres"]
      interval: 10s
--- a/roles/docker-roulette-wheel/templates/docker-compose.yml.j2
+++ b/roles/docker-roulette-wheel/templates/docker-compose.yml.j2
@@ -6,4 +6,4 @@ services:
            context: .
        ports:
        - 127.0.0.1:{{http_port}}:8080
-        restart: always
+        restart: {{docker_restart_policy}}
--- a/roles/docker-wordpress/templates/docker-compose.yml.j2
+++ b/roles/docker-wordpress/templates/docker-compose.yml.j2
@@ -10,7 +10,7 @@ services:
    image: custom_wordpress
    build:
      context: .
-    restart: always
+    restart: {{docker_restart_policy}}
    ports:
      - "127.0.0.1:{{http_port}}:80"
    environment:
--- a/roles/docker-yourls/templates/docker-compose.yml.j2
+++ b/roles/docker-yourls/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@ services:
    logging:
      driver: journald
    image: yourls
-    restart: always
+    restart: {{docker_restart_policy}}
    ports:
      - "127.0.0.1:{{http_port}}:80"
    environment:
--- a/templates/docker-service-mariadb.yml.j2
+++ b/templates/docker-service-mariadb.yml.j2
@@ -5,7 +5,7 @@
    logging:
      driver: journald
    image: mariadb
-    restart: always
+    restart: {{docker_restart_policy}}
    environment:
      MYSQL_DATABASE: "{{database_name}}"
      MYSQL_USER: "{{database_username}}"
--- a/templates/docker-service-postgres.yml.j2
+++ b/templates/docker-service-postgres.yml.j2
@@ -8,7 +8,7 @@
      - POSTGRES_USER={{database_username}}
      - POSTGRES_DB={{database_name}}
      - POSTGRES_INITDB_ARGS=--encoding=UTF8 --locale=C
-    restart: always
+    restart: {{docker_restart_policy}}
    healthcheck:
      test: ["CMD-SHELL", "pg_isready -U {{database_name}}"]
      interval: 10s
--- a/templates/docker-service-redis.yml.j2
+++ b/templates/docker-service-redis.yml.j2
@@ -2,7 +2,7 @@
  redis:
    image: redis:alpine
    container_name: {{docker_compose_project_name}}-redis
-    restart: always
+    restart: {{docker_restart_policy}}
    logging:
      driver: journald
    volumes: