From ce62a0524c7143a50833436b721bb557b13f1266 Mon Sep 17 00:00:00 2001 From: Suhaib Affan Date: Wed, 19 Jul 2023 20:19:56 -0400 Subject: [PATCH 1/3] Added restart policy to docker compose files. --- docker-compose.prod.yml | 32 +++++++++++++++++++++++++++++++- docker-compose.yml | 15 +++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 04c580729..e4b0f0895 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -21,10 +21,20 @@ services: depends_on: - server - webapp + deploy: + restart_policy: + condition: on-failure + delay: 5s + window: 120s webapp: container_name: bigcapital-webapp image: ghcr.io/bigcapitalhq/webapp:latest + deploy: + restart_policy: + condition: on-failure + delay: 5s + window: 120s server: container_name: bigcapital-server @@ -37,6 +47,11 @@ services: - mysql - mongo - redis + deploy: + restart_policy: + condition: on-failure + delay: 5s + window: 120s environment: # Mail - MAIL_HOST=${MAIL_HOST} @@ -93,6 +108,11 @@ services: mysql: container_name: bigcapital-mysql + deploy: + restart_policy: + condition: on-failure + delay: 5s + window: 120s build: context: ./docker/mariadb environment: @@ -106,7 +126,12 @@ services: - '3306' mongo: - container_name: bigcapital-mongo + container_name: bigcapital-mongo + deploy: + restart_policy: + condition: on-failure + delay: 5s + window: 120s build: ./docker/mongo expose: - '27017' @@ -115,6 +140,11 @@ services: redis: container_name: bigcapital-redis + deploy: + restart_policy: + condition: on-failure + delay: 5s + window: 120s build: context: ./docker/redis expose: diff --git a/docker-compose.yml b/docker-compose.yml index 11143c063..8df1498f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,11 @@ services: - '3306' ports: - '3306:3306' + deploy: + restart_policy: + condition: on-failure + delay: 5s + window: 120s mongo: build: ./docker/mongo @@ -29,6 +34,11 @@ services: - mongo:/var/lib/mongodb ports: - '27017:27017' + deploy: + restart_policy: + condition: on-failure + delay: 5s + window: 120s redis: build: @@ -37,6 +47,11 @@ services: - "6379" volumes: - redis:/data + deploy: + restart_policy: + condition: on-failure + delay: 5s + window: 120s # Volumes volumes: From ef5ef647d4842e029d4ec3fa4f46a048d52e3a69 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sun, 23 Jul 2023 19:54:55 +0200 Subject: [PATCH 2/3] chore: change docker restart policy to unless-stopped --- docker-compose.prod.yml | 20 +++++--------------- docker-compose.yml | 12 +++--------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e4b0f0895..7b5236e1b 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -23,18 +23,14 @@ services: - webapp deploy: restart_policy: - condition: on-failure - delay: 5s - window: 120s + condition: unless-stopped webapp: container_name: bigcapital-webapp image: ghcr.io/bigcapitalhq/webapp:latest deploy: restart_policy: - condition: on-failure - delay: 5s - window: 120s + condition: unless-stopped server: container_name: bigcapital-server @@ -49,9 +45,7 @@ services: - redis deploy: restart_policy: - condition: on-failure - delay: 5s - window: 120s + condition: unless-stopped environment: # Mail - MAIL_HOST=${MAIL_HOST} @@ -129,9 +123,7 @@ services: container_name: bigcapital-mongo deploy: restart_policy: - condition: on-failure - delay: 5s - window: 120s + condition: unless-stopped build: ./docker/mongo expose: - '27017' @@ -142,9 +134,7 @@ services: container_name: bigcapital-redis deploy: restart_policy: - condition: on-failure - delay: 5s - window: 120s + condition: unless-stopped build: context: ./docker/redis expose: diff --git a/docker-compose.yml b/docker-compose.yml index 8df1498f6..9563ae91e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,9 +22,7 @@ services: - '3306:3306' deploy: restart_policy: - condition: on-failure - delay: 5s - window: 120s + condition: unless-stopped mongo: build: ./docker/mongo @@ -36,9 +34,7 @@ services: - '27017:27017' deploy: restart_policy: - condition: on-failure - delay: 5s - window: 120s + condition: unless-stopped redis: build: @@ -49,9 +45,7 @@ services: - redis:/data deploy: restart_policy: - condition: on-failure - delay: 5s - window: 120s + condition: unless-stopped # Volumes volumes: From 7a33f7926828e6bce3c95dc2687ae77a36ab5098 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sun, 23 Jul 2023 20:05:34 +0200 Subject: [PATCH 3/3] chore: update mysql docker container restart policy --- docker-compose.prod.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 7b5236e1b..b7e2e1040 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -104,9 +104,7 @@ services: container_name: bigcapital-mysql deploy: restart_policy: - condition: on-failure - delay: 5s - window: 120s + condition: unless-stopped build: context: ./docker/mariadb environment: