瀏覽代碼

Include COMPOSE_PROJECT_NAME in Nginx url

Kasim 1 年之前
父節點
當前提交
0cdf7647c4
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      data/Dockerfiles/acme/acme.sh

+ 2 - 2
data/Dockerfiles/acme/acme.sh

@@ -123,7 +123,7 @@ done
 log_f "Database OK"
 log_f "Database OK"
 
 
 log_f "Waiting for Nginx..."
 log_f "Waiting for Nginx..."
-until $(curl --output /dev/null --silent --head --fail http://nginx.mailcowdockerized_mailcow-network:8081); do
+until $(curl --output /dev/null --silent --head --fail http://nginx.${COMPOSE_PROJECT_NAME}_mailcow-network:8081); do
   sleep 2
   sleep 2
 done
 done
 log_f "Nginx OK"
 log_f "Nginx OK"
@@ -137,7 +137,7 @@ log_f "Resolver OK"
 # Waiting for domain table
 # Waiting for domain table
 log_f "Waiting for domain table..."
 log_f "Waiting for domain table..."
 while [[ -z ${DOMAIN_TABLE} ]]; do
 while [[ -z ${DOMAIN_TABLE} ]]; do
-  curl --silent http://nginx.mailcowdockerized_mailcow-network/ >/dev/null 2>&1
+  curl --silent http://nginx.${COMPOSE_PROJECT_NAME}_mailcow-network/ >/dev/null 2>&1
   DOMAIN_TABLE=$(mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SHOW TABLES LIKE 'domain'" -Bs)
   DOMAIN_TABLE=$(mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SHOW TABLES LIKE 'domain'" -Bs)
   [[ -z ${DOMAIN_TABLE} ]] && sleep 10
   [[ -z ${DOMAIN_TABLE} ]] && sleep 10
 done
 done