From ffc4a569085d705ab15d4a8c73a95a40ebe18af5 Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Tue, 7 Jun 2022 15:16:16 +0800
Subject: [PATCH] Update docker-compose.yml

---
 docker-compose.yml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 223cd3c..5ece9e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-
 # image: https://registry.hub.docker.com/r/frappe/erpnext-worker
 # docs: https://github.com/frappe/frappe_docker/blob/main/pwd.yml
 
@@ -6,7 +5,7 @@ version: "3.8"
 
 services:
   backend:
-    image: frappe/erpnext-worker:v13.32.0
+    image: frappe/erpnext-worker:${APP_VERSION}
     deploy:
       restart_policy:
         condition: on-failure
@@ -15,7 +14,7 @@ services:
       - assets:/home/frappe/frappe-bench/sites/assets
 
   configurator:
-    image: frappe/erpnext-worker:v13.32.0
+    image: frappe/erpnext-worker:${APP_VERSION}
     command:
       - configure.py
     environment:
@@ -29,7 +28,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   create-site:
-    image: frappe/erpnext-worker:v13.32.0
+    image: frappe/erpnext-worker:${APP_VERSION}
     deploy:
       restart_policy:
         condition: on-failure
@@ -41,8 +40,8 @@ services:
       - -c
     command:
       - >
-        wait-for-it -t 120 db:3306;
-        wait-for-it -t 120 redis:6379;
+        wait-for-it -t 20 db:3306;
+        wait-for-it -t 20 redis:6379;
         export start=`date +%s`;
         until [[ -n `grep -hs ^ common_site_config.json | jq -r ".db_host // empty"` ]] && \
           [[ -n `grep -hs ^ common_site_config.json | jq -r ".redis_cache // empty"` ]] && \
@@ -50,17 +49,17 @@ services:
         do
           echo "Waiting for common_site_config.json to be created";
           sleep 5;
-          if (( `date +%s`-start > 120 )); then
+          if (( `date +%s`-start > 20 )); then
             echo "could not find common_site_config.json with required keys";
             exit 1
           fi
         done;
         echo "common_site_config.json found";
-        bench new-site frontend --admin-password=admin --db-root-password=admin --install-app erpnext --set-default;
+        bench new-site frontend --admin-password=${APP_PASSWORD} --db-root-password=${DB_MARIA_PASSWORD} --install-app erpnext --set-default;
   db:
     image: mariadb:10.6
     healthcheck:
-      test: mysqladmin ping -h localhost --password=admin
+      test: mysqladmin ping -h localhost --password=${DB_MARIA_PASSWORD}
       interval: 1s
       retries: 15
     deploy:
@@ -72,12 +71,12 @@ services:
       - --skip-character-set-client-handshake
       - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
     environment:
-      MYSQL_ROOT_PASSWORD: admin
+      MYSQL_ROOT_PASSWORD: ${DB_MARIA_PASSWORD}
     volumes:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext-nginx:v13.32.0
+    image: frappe/erpnext-nginx:${APP_VERSION}
     deploy:
       restart_policy:
         condition: on-failure
@@ -95,7 +94,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext-worker:v13.32.0
+    image: frappe/erpnext-worker:${APP_VERSION}
     deploy:
       restart_policy:
         condition: on-failure
@@ -108,7 +107,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-long:
-    image: frappe/erpnext-worker:v13.32.0
+    image: frappe/erpnext-worker:${APP_VERSION}
     deploy:
       restart_policy:
         condition: on-failure
@@ -121,7 +120,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   queue-short:
-    image: frappe/erpnext-worker:v13.32.0
+    image: frappe/erpnext-worker:${APP_VERSION}
     deploy:
       restart_policy:
         condition: on-failure
@@ -142,7 +141,7 @@ services:
       - redis-data:/data
 
   scheduler:
-    image: frappe/erpnext-worker:v13.32.0
+    image: frappe/erpnext-worker:${APP_VERSION}
     deploy:
       restart_policy:
         condition: on-failure
@@ -153,7 +152,7 @@ services:
       - sites:/home/frappe/frappe-bench/sites
 
   websocket:
-    image: frappe/frappe-socketio:v13.31.0
+    image: frappe/frappe-socketio:${APP_VERSION}
     deploy:
       restart_policy:
         condition: on-failure