From fc4ca85f083ae418ebb1da10affc128fe92ddd0b Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 22 Jul 2021 08:35:52 +1000
Subject: [PATCH] Update docker-compose restart flags
After I replace the docker packages some services I thought would come
back did not.
Lodegit seems to be an oversight, add restart always.
Also make sure the ZK containers start themselves.
I believe with Gerrit we've made the choice to not start automatically
due to the general high-touch nature of restarts. Keep the database
consistent and remove the auto restart there.
Change-Id: I98fa3055ac269564ed96570df0700b2aad24e4d2
---
playbooks/roles/gerrit/templates/docker-compose.yaml.j2 | 1 -
playbooks/roles/lodgeit/templates/docker-compose.yaml.j2 | 1 +
.../roles/zookeeper/files/zookeeper-compose/docker-compose.yaml | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2 b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
index 8c814217fc..99ff14f14b 100644
--- a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
@@ -4,7 +4,6 @@ services:
mariadb:
image: docker.io/library/mariadb:10.4
network_mode: host
- restart: always
environment:
MYSQL_ROOT_PASSWORD: "{{ gerrit_reviewdb_mariadb_password }}"
MYSQL_DATABASE: "{{ gerrit_reviewdb_mariadb_dbname }}"
diff --git a/playbooks/roles/lodgeit/templates/docker-compose.yaml.j2 b/playbooks/roles/lodgeit/templates/docker-compose.yaml.j2
index f4dacde297..7516009838 100644
--- a/playbooks/roles/lodgeit/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/lodgeit/templates/docker-compose.yaml.j2
@@ -23,6 +23,7 @@ services:
image: docker.io/opendevorg/lodgeit
depends_on:
- mariadb
+ restart: always
network_mode: host
command: ['/bin/bash', '-c', 'echo "*** Starting"; sleep 30; /usr/local/bin/uwsgi']
logging:
diff --git a/playbooks/roles/zookeeper/files/zookeeper-compose/docker-compose.yaml b/playbooks/roles/zookeeper/files/zookeeper-compose/docker-compose.yaml
index b2890331ae..576b0ac28e 100644
--- a/playbooks/roles/zookeeper/files/zookeeper-compose/docker-compose.yaml
+++ b/playbooks/roles/zookeeper/files/zookeeper-compose/docker-compose.yaml
@@ -5,6 +5,7 @@ version: '2'
services:
zk:
image: docker.io/library/zookeeper:3.5
+ restart: always
network_mode: host
user: "10001:10001"
volumes: